hoauth2 2.0.0 → 2.1.0

raw patch · 16 files changed

+23/−22 lines, 16 filesdep ~aesondep ~mustachePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: aeson, mustache

API changes (from Hackage documentation)

Files

example/IDP/Auth0.hs +1/−1
example/IDP/AzureAD.hs +1/−1
example/IDP/Douban.hs +1/−1
example/IDP/Dropbox.hs +1/−1
example/IDP/Facebook.hs +1/−1
example/IDP/Fitbit.hs +1/−1
example/IDP/Github.hs +1/−1
example/IDP/Google.hs +1/−1
example/IDP/Linkedin.hs +1/−1
example/IDP/Okta.hs +1/−1
example/IDP/Slack.hs +1/−1
example/IDP/StackExchange.hs +1/−1
example/IDP/Weibo.hs +1/−1
example/IDP/ZOHO.hs +1/−1
hoauth2.cabal +5/−5
src/Network/OAuth/OAuth2/HttpClient.hs +4/−3

example/IDP/Auth0.hs view

@@ -17,7 +17,7 @@ import Utils  data Auth0 = Auth0-  deriving (Show, Generic)+  deriving (Show, Generic, Eq)  instance Hashable Auth0

example/IDP/AzureAD.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data AzureAD = AzureAD deriving (Show, Generic)+data AzureAD = AzureAD deriving (Show, Generic, Eq)  instance Hashable AzureAD

example/IDP/Douban.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data Douban = Douban deriving (Show, Generic)+data Douban = Douban deriving (Show, Generic, Eq)  instance Hashable Douban

example/IDP/Dropbox.hs view

@@ -16,7 +16,7 @@ import           URI.ByteString.QQ import           Utils -data Dropbox = Dropbox deriving (Show, Generic)+data Dropbox = Dropbox deriving (Show, Generic, Eq)  instance Hashable Dropbox

example/IDP/Facebook.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data Facebook = Facebook deriving (Show, Generic)+data Facebook = Facebook deriving (Show, Generic, Eq)  instance Hashable Facebook

example/IDP/Fitbit.hs view

@@ -17,7 +17,7 @@ import           Utils  -data Fitbit = Fitbit deriving (Show, Generic)+data Fitbit = Fitbit deriving (Show, Generic, Eq)  instance Hashable Fitbit

example/IDP/Github.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data Github = Github deriving (Show, Generic)+data Github = Github deriving (Show, Generic, Eq)  instance Hashable Github

example/IDP/Google.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data Google = Google deriving (Show, Generic)+data Google = Google deriving (Show, Generic, Eq)  instance Hashable Google

example/IDP/Linkedin.hs view

@@ -19,7 +19,7 @@  data LinkedinUser = LinkedinUser { firstName :: Text                                  , lastName  :: Text-                                 } deriving (Show, Generic)+                                 } deriving (Show, Generic, Eq)  instance FromJSON LinkedinUser where     parseJSON = genericParseJSON defaultOptions

example/IDP/Okta.hs view

@@ -17,7 +17,7 @@ import Utils  data Okta = Okta-  deriving (Show, Generic)+  deriving (Show, Generic, Eq)  instance Hashable Okta

example/IDP/Slack.hs view

@@ -17,7 +17,7 @@ import Utils  data Slack = Slack-  deriving (Show, Generic)+  deriving (Show, Generic, Eq)  instance Hashable Slack

example/IDP/StackExchange.hs view

@@ -23,7 +23,7 @@ import           URI.ByteString.QQ import           Utils -data StackExchange = StackExchange deriving (Show, Generic)+data StackExchange = StackExchange deriving (Show, Generic, Eq)  instance Hashable StackExchange

example/IDP/Weibo.hs view

@@ -18,7 +18,7 @@ import URI.ByteString.QQ import Utils -data Weibo = Weibo deriving (Show, Generic)+data Weibo = Weibo deriving (Show, Generic, Eq)  instance Hashable Weibo

example/IDP/ZOHO.hs view

@@ -15,7 +15,7 @@ import           URI.ByteString.QQ import           Utils -data ZOHO = ZOHO deriving (Show, Generic)+data ZOHO = ZOHO deriving (Show, Generic, Eq)  instance Hashable ZOHO

hoauth2.cabal view

@@ -1,7 +1,7 @@ Cabal-version: 2.4 Name:                hoauth2 -- http://wiki.haskell.org/Package_versioning_policy-Version:             2.0.0+Version:             2.1.0  Synopsis:            Haskell OAuth2 authentication client @@ -34,7 +34,7 @@ Category:            Network Build-type:          Simple Stability:           Beta-Tested-With:         GHC <= 8.6.5+Tested-With:         GHC <= 8.10.7  Extra-source-files: README.md                     example/Keys.hs.sample@@ -82,7 +82,7 @@                  bytestring           >= 0.9   && < 0.11,                  http-conduit         >= 2.1   && < 2.4,                  http-types           >= 0.11   && < 0.13,-                 aeson                >= 1.3.0.0 && < 1.6,+                 aeson                >= 2.0 && < 2.1,                  unordered-containers >= 0.2.5,                  uri-bytestring       >= 0.2.3.1 && < 0.4,                  uri-bytestring-aeson >= 0.1   && < 0.2,@@ -131,11 +131,11 @@                        http-types        >= 0.11    && < 0.13,                        wai               >= 3.2    && < 3.3,                        warp              >= 3.2    && < 3.4,-                       aeson             >= 1.3.0.0 && < 1.6,+                       aeson             >= 2.0 && < 2.1,                        microlens            >= 0.4.0 && < 0.5,                        unordered-containers >= 0.2.5,                        wai-middleware-static >= 0.8.1 && < 0.10.0,-                       mustache >= 2.2.3 && < 2.4.0,+                       mustache >= 2.2.3 && < 2.5.0,                        scotty >= 0.10.0 && < 0.13,                        binary >= 0.8.3.0 && < 0.8.9,                        parsec >= 3.1.11 && < 3.2.0 ,

src/Network/OAuth/OAuth2/HttpClient.hs view

@@ -22,11 +22,12 @@   authRequest ) where +import qualified Data.Aeson.KeyMap as KeyMap+import           qualified Data.Aeson.Key as Key import           Data.Aeson import           Data.Bifunctor                    (first) import qualified Data.ByteString.Char8             as BS import qualified Data.ByteString.Lazy.Char8        as BSL-import qualified Data.HashMap.Strict               as HM (fromList) import           Data.Maybe import qualified Data.Text.Encoding                as T import           Network.HTTP.Conduit@@ -153,8 +154,8 @@                                     Error _   -> Left errorMessage                                     Success x -> Right x   where-    queryToValue = Object . HM.fromList . map paramToPair-    paramToPair (k, mv) = (T.decodeUtf8 k, maybe Null (String . T.decodeUtf8) mv)+    queryToValue = Object . KeyMap.fromList . map paramToPair+    paramToPair (k, mv) = (Key.fromText $T.decodeUtf8 k, maybe Null (String . T.decodeUtf8) mv)     errorMessage = parseOAuth2Error b  --------------------------------------------------