yesod-auth-oauth2 0.0.7 → 0.0.8

raw patch · 2 files changed

+12/−9 lines, 2 files

Files

• Yesod/Auth/OAuth2/Github.hs +11/−8
• yesod-auth-oauth2.cabal +1/−1

@@ -32,7 +32,7 @@  data GithubUser = GithubUser     { githubUserId    :: Int-    , githubUserName  :: Text+    , githubUserName  :: Maybe Text     , githubUserLogin :: Text     , githubUserAvatarUrl :: Text     }@@ -40,7 +40,7 @@ instance FromJSON GithubUser where     parseJSON (Object o) =         GithubUser <$> o .: "id"-                   <*> o .: "name"+                   <*> o .:? "name"                    <*> o .: "login"                    <*> o .: "avatar_url" @@ -113,9 +113,12 @@ toCreds :: GithubUser -> [GithubUserEmail] -> AccessToken -> Creds m toCreds user userMail token = Creds "github"     (T.pack $ show $ githubUserId user)-    [ ("name", githubUserName user)-    , ("email", githubUserEmail $ head userMail)-    , ("login", githubUserLogin user)-    , ("avatar_url", githubUserAvatarUrl user)-    , ("access_token", decodeUtf8 $ accessToken token)-    ]+    cExtra+    where+        cExtra = [ ("email", githubUserEmail $ head userMail)+                 , ("login", githubUserLogin user)+                 , ("avatar_url", githubUserAvatarUrl user)+                 , ("access_token", decodeUtf8 $ accessToken token)+                 ] ++ (maybeName $ githubUserName user)+        maybeName Nothing     = []+        maybeName (Just name) = [("name", name)]

@@ -1,5 +1,5 @@ name:            yesod-auth-oauth2-version:         0.0.7+version:         0.0.8 license:         BSD3 license-file:    LICENSE author:          Tom Streller