haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #822 from docmunch/no-id-token

Browse Source 
remove the id_token parameter
This commit is contained in:
Michael Snoyman 2014-09-12 07:01:51 +03:00
commit ef55173383
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yesod-auth/Yesod/Auth/GoogleEmail2.hs
View File

@ -156,7 +156,7 @@ authGoogleEmail clientID clientSecret =
manager <- liftM authHttpManager $ lift getYesod manager <- liftM authHttpManager $ lift getYesod
res <- http req manager res <- http req manager
value <- responseBody res $$+- sinkParser json' value <- responseBody res $$+- sinkParser json'
Tokens accessToken _idToken tokenType <- Tokens accessToken tokenType <-
case parseEither parseJSON value of case parseEither parseJSON value of
Left e -> error e Left e -> error e
Right t -> return t Right t -> return t
@ -184,11 +184,10 @@ authGoogleEmail clientID clientSecret =
dispatch _ _ = notFound dispatch _ _ = notFound
data Tokens = Tokens Text Text Text data Tokens = Tokens Text Text
instance FromJSON Tokens where instance FromJSON Tokens where
parseJSON = withObject "Tokens" $ \o -> Tokens parseJSON = withObject "Tokens" $ \o -> Tokens
<$> o .: "access_token" <$> o .: "access_token"
<*> o .: "id_token"
<*> o .: "token_type" <*> o .: "token_type"
data Person = Person [Email] data Person = Person [Email]

2
yesod-auth/yesod-auth.cabal
View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 1.3.4.3 version: 1.3.4.4
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin