This commit is contained in:
patrick brisbin 2021-01-05 13:48:38 -05:00
parent 7c8d3eac49
commit 16928434af
No known key found for this signature in database
GPG Key ID: 20299C6982D938FB

View File

@ -46,8 +46,8 @@ import Yesod.Auth.OAuth2.Nylas
import Yesod.Auth.OAuth2.Salesforce import Yesod.Auth.OAuth2.Salesforce
import Yesod.Auth.OAuth2.Slack import Yesod.Auth.OAuth2.Slack
import Yesod.Auth.OAuth2.Spotify import Yesod.Auth.OAuth2.Spotify
import Yesod.Auth.OAuth2.WordPressDotCom
import Yesod.Auth.OAuth2.Upcase import Yesod.Auth.OAuth2.Upcase
import Yesod.Auth.OAuth2.WordPressDotCom
data App = App data App = App
{ appHttpManager :: Manager { appHttpManager :: Manager
@ -73,10 +73,9 @@ instance YesodAuth App where
-- Copy the Creds response into the session for viewing after -- Copy the Creds response into the session for viewing after
authenticate c = do authenticate c = do
mapM_ (uncurry setSession) $ mapM_ (uncurry setSession)
[ ("credsIdent", credsIdent c) $ [("credsIdent", credsIdent c), ("credsPlugin", credsPlugin c)]
, ("credsPlugin", credsPlugin c) ++ credsExtra c
] ++ credsExtra c
return $ Authenticated "1" return $ Authenticated "1"
@ -150,7 +149,7 @@ mkFoundation = do
, loadPlugin oauth2Upcase "UPCASE" , loadPlugin oauth2Upcase "UPCASE"
] ]
return App {..} return App { .. }
where where
loadPlugin f prefix = do loadPlugin f prefix = do
clientId <- getEnv $ prefix <> "_CLIENT_ID" clientId <- getEnv $ prefix <> "_CLIENT_ID"