Merge branch 'add/gitlab-to-env-example' into merge/test-all-providers

This commit is contained in:
nbloomf 2020-07-08 01:40:07 -05:00
commit d8a1d4127e
2 changed files with 9 additions and 1 deletions

View File

@ -5,6 +5,9 @@
# you plan to try. # you plan to try.
# #
### ###
AZURE_AD_CLIENT_ID=x
AZURE_AD_CLIENT_SECRET=x
BATTLE_NET_CLIENT_ID=x BATTLE_NET_CLIENT_ID=x
BATTLE_NET_CLIENT_SECRET=x BATTLE_NET_CLIENT_SECRET=x
@ -17,6 +20,9 @@ EVE_ONLINE_CLIENT_SECRET=x
GITHUB_CLIENT_ID=x GITHUB_CLIENT_ID=x
GITHUB_CLIENT_SECRET=x GITHUB_CLIENT_SECRET=x
GITLAB_CLIENT_ID=x
GITLAB_CLIENT_SECRET=x
GOOGLE_CLIENT_ID=x GOOGLE_CLIENT_ID=x
GOOGLE_CLIENT_SECRET=x GOOGLE_CLIENT_SECRET=x

View File

@ -35,6 +35,7 @@ import Network.Wai.Handler.Warp (runEnv)
import System.Environment (getEnv, lookupEnv) import System.Environment (getEnv, lookupEnv)
import Yesod import Yesod
import Yesod.Auth import Yesod.Auth
import Yesod.Auth.OAuth2.AzureAD
import Yesod.Auth.OAuth2.BattleNet import Yesod.Auth.OAuth2.BattleNet
import Yesod.Auth.OAuth2.Bitbucket import Yesod.Auth.OAuth2.Bitbucket
import Yesod.Auth.OAuth2.EveOnline import Yesod.Auth.OAuth2.EveOnline
@ -134,7 +135,8 @@ mkFoundation = do
-- --
-- FIXME: oauth2BattleNet is quite annoying! -- FIXME: oauth2BattleNet is quite annoying!
-- --
[ loadPlugin (oauth2BattleNet [whamlet|TODO|] "en") "BATTLE_NET" [ loadPlugin oauth2AzureAD "AZURE_AD"
, loadPlugin (oauth2BattleNet [whamlet|TODO|] "en") "BATTLE_NET"
, loadPlugin oauth2Bitbucket "BITBUCKET" , loadPlugin oauth2Bitbucket "BITBUCKET"
, loadPlugin (oauth2Eve Plain) "EVE_ONLINE" , loadPlugin (oauth2Eve Plain) "EVE_ONLINE"
, loadPlugin oauth2GitHub "GITHUB" , loadPlugin oauth2GitHub "GITHUB"