will it work now

unfoldml · Oct 31, 2023 · 91ad617 · 91ad617
1 parent ef3afa9
commit 91ad617
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ms-auth/src/Network/OAuth2/Provider/AzureAD.hs b/ms-auth/src/Network/OAuth2/Provider/AzureAD.hs
@@ -27,6 +27,7 @@ module Network.OAuth2.Provider.AzureAD (
     , AzureADException(..)
     -- * Types
     , Idp(..), IdpApplication(..)
+    , GrantTypeFlow(..)
     ) where
 
 -- import Data.String (IsString(..))

diff --git a/ms-graph-api-test/app/Main.hs b/ms-graph-api-test/app/Main.hs
@@ -19,7 +19,7 @@ import Network.HTTP.Client (Manager, newManager)
 import Network.HTTP.Client.TLS (tlsManagerSettings)
 -- ms-auth
 import MSAuth (OAuth2Token(..))
-import Network.OAuth2.Provider.AzureAD (IdpApplication, GrantTypeFlow(..))
+import Network.OAuth2.Provider.AzureAD (OAuthCfg(..), azureOAuthADApp, AzureAD, IdpApplication, GrantTypeFlow(..))
 -- req
 import Network.HTTP.Req (HttpConfig, runReq, defaultHttpConfig, httpConfigAltManager)
 -- scotty
@@ -42,7 +42,7 @@ import qualified MSGraphAPI.Files.Drive as MSD (Drive(..), listDrivesGroup)
 import qualified MSGraphAPI.Files.DriveItem as MSDI (listRootChildrenMe)
 import qualified MSGraphAPI.Users.Group as MSGU (Group(..), listMeJoinedTeams, listGroupsDriveItems)
 import qualified MSGraphAPI.Users.User as MSG (getMe, User(..))
-import Network.OAuth2.Provider.AzureAD (OAuthCfg(..), azureOAuthADApp, AzureAD)
+
 import MSAuth (Tokens, newTokens, tokensToList, withAADUser, loginEndpoint, replyEndpoint, UserSub, Scotty, Action)
 
 

diff --git a/ms-graph-api-test/ms-graph-api-test.cabal b/ms-graph-api-test/ms-graph-api-test.cabal
@@ -19,8 +19,11 @@ library
   default-language:    Haskell2010
   hs-source-dirs:      src
   exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5,
-                       directory >= 1.3.6.2
+  build-depends:       base >= 4.7 && < 5
+                     , directory >= 1.3.6.2
+                     , ms-auth >= 0.5
+                     , ms-graph-api
+
   ghc-options:         -Wall
 
 executable ms-graph-api-test
@@ -35,8 +38,8 @@ executable ms-graph-api-test
                      , dotenv-micro == 0.1.0.1
                      , http-client
                      , http-client-tls >= 0.3
-                     , ms-auth >= 0.5
-                     , ms-graph-api
+                     , ms-auth
+                     , ms-graph-api >= 0.12
                      , ms-graph-api-test
                      , req
                      , scotty