haskell/yesod-auth-oauth2
1
0
Fork 0
mirror of https://github.com/freckle/yesod-auth-oauth2.git synced 2026-09-10 11:34:55 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 15e076d2d1 into 4317119944

Browse Source
This commit is contained in:
Noon van der Silk 2016-01-04 17:34:00 +00:00
commit cdf694bc2b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Yesod/Auth/OAuth2/Github.hs
View File

@ -35,6 +35,7 @@ data GithubUser = GithubUser
, githubUserName :: Maybe Text , githubUserName :: Maybe Text
, githubUserLogin :: Text , githubUserLogin :: Text
, githubUserAvatarUrl :: Text , githubUserAvatarUrl :: Text
, githubUserLocation :: Text
} }
instance FromJSON GithubUser where instance FromJSON GithubUser where
@ -43,6 +44,7 @@ instance FromJSON GithubUser where
<*> o .:? "name" <*> o .:? "name"
<*> o .: "login" <*> o .: "login"
<*> o .: "avatar_url" <*> o .: "avatar_url"
<*> o .: "location"
parseJSON _ = mzero parseJSON _ = mzero
@ -96,6 +98,7 @@ toCreds user userMail token = Creds
[ ("email", githubUserEmail $ head userMail) [ ("email", githubUserEmail $ head userMail)
, ("login", githubUserLogin user) , ("login", githubUserLogin user)
, ("avatar_url", githubUserAvatarUrl user) , ("avatar_url", githubUserAvatarUrl user)
, ("location", githubUserLocation user)
, ("access_token", decodeUtf8 $ accessToken token) , ("access_token", decodeUtf8 $ accessToken token)
] ++ maybeName (githubUserName user) ] ++ maybeName (githubUserName user)
} }