fixed migrate out of hoauth2

unfoldml · Oct 31, 2023 · 05e98a7 · 05e98a7
1 parent c9d22ed
commit 05e98a7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/ms-graph-api/ms-graph-api.cabal b/ms-graph-api/ms-graph-api.cabal
@@ -35,7 +35,7 @@ library
  , http-client-tls >= 0.3
  , http-types
  , modern-uri
- , ms-auth
+ , ms-auth >= 0.5
  , req
  , scientific
  , text

diff --git a/ms-graph-api/src/MSGraphAPI/ChangeNotifications/Subscription.hs b/ms-graph-api/src/MSGraphAPI/ChangeNotifications/Subscription.hs
@@ -62,8 +62,8 @@ import GHC.Generics (Generic(..))
 -- aeson
 import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), encode, eitherDecode, genericParseJSON, genericToEncoding, defaultOptions, Options(..), withObject, withText, (.:), (.:?), object, (.=))
 import qualified Data.Aeson.Encoding as A (text)
--- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+-- ms-auth
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text

diff --git a/ms-graph-api/src/MSGraphAPI/Drive.hs b/ms-graph-api/src/MSGraphAPI/Drive.hs
@@ -5,8 +5,8 @@ import GHC.Generics (Generic(..))
 
 -- aeson
 import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), genericParseJSON)
--- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+-- ms-auth
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text

diff --git a/ms-graph-api/src/MSGraphAPI/Files/Drive.hs b/ms-graph-api/src/MSGraphAPI/Files/Drive.hs
@@ -14,8 +14,8 @@ import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), genericParseJSON)
 -- import qualified Data.Aeson.Types as A (Parser)
 -- bytestring
 -- import qualified Data.ByteString.Lazy as LBS (ByteString)
--- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+-- ms-auth
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text

diff --git a/ms-graph-api/src/MSGraphAPI/Files/DriveItem.hs b/ms-graph-api/src/MSGraphAPI/Files/DriveItem.hs
@@ -22,8 +22,8 @@ import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), genericParseJSON, (.
 import qualified Data.Aeson.Types as A (Parser)
 -- bytestring
 import qualified Data.ByteString.Lazy as LBS (ByteString)
--- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+-- ms-auth
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text

diff --git a/ms-graph-api/src/MSGraphAPI/Internal/Common.hs b/ms-graph-api/src/MSGraphAPI/Internal/Common.hs
@@ -42,9 +42,8 @@ import qualified Data.ByteString as BS (ByteString)
 import qualified Data.ByteString.Char8 as BS8 (pack, unpack)
 import qualified Data.ByteString.Lazy as LBS (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as LBS8 (pack, unpack, putStrLn)
--- hoauth2
-import Network.OAuth.OAuth2 (OAuth2Token(..))
-import Network.OAuth.OAuth2.Internal (AccessToken(..), ExchangeToken(..), RefreshToken(..), OAuth2Error, IdToken(..))
+-- ms-auth
+import MSAuth (OAuth2Token(..), AccessToken(..), ExchangeToken(..), RefreshToken(..), OAuth2Error, IdToken(..))
 -- http-client
 import Network.HTTP.Client (Manager)
 -- http-client-tls

diff --git a/ms-graph-api/src/MSGraphAPI/Users/Group.hs b/ms-graph-api/src/MSGraphAPI/Users/Group.hs
@@ -34,7 +34,7 @@ import GHC.Generics (Generic(..))
 -- aeson
 import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), genericParseJSON)
 -- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text

diff --git a/ms-graph-api/src/MSGraphAPI/Users/User.hs b/ms-graph-api/src/MSGraphAPI/Users/User.hs
@@ -9,8 +9,8 @@ import GHC.Generics (Generic(..))
 
 -- aeson
 import qualified Data.Aeson as A (ToJSON(..), FromJSON(..), genericParseJSON)
--- hoauth
-import Network.OAuth.OAuth2.Internal (AccessToken(..))
+-- ms-auth
+import MSAuth (AccessToken(..))
 -- req
 import Network.HTTP.Req (Req)
 -- text