diff options
| author | Sheogorath | 2020-02-09 13:48:26 +0100 |
|---|---|---|
| committer | Sheogorath | 2020-02-09 13:48:26 +0100 |
| commit | d5ae45b268452f315926bc4a8ded83e112603d0c (patch) | |
| tree | 9e3b5cff1f93ec6dcda13a29421f7ae4248185cd /lib/config | |
| parent | b3d4cdbcebe1690bf5211d778ff6f8a0f9f5e518 (diff) | |
| parent | 78682f57c43c8af8abccc60848df4d7533dabc60 (diff) | |
Merge branch 'google-oauth'
See https://github.com/codimd/server/pull/265
Diffstat (limited to 'lib/config')
| -rw-r--r-- | lib/config/default.js | 3 | ||||
| -rw-r--r-- | lib/config/dockerSecret.js | 3 | ||||
| -rw-r--r-- | lib/config/environment.js | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/config/default.js b/lib/config/default.js index a52a8a4f..ac78e8ed 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -124,7 +124,8 @@ module.exports = { }, google: { clientID: undefined, - clientSecret: undefined + clientSecret: undefined, + hostedDomain: undefined }, ldap: { providerName: undefined, diff --git a/lib/config/dockerSecret.js b/lib/config/dockerSecret.js index 7ff6506f..02b959d9 100644 --- a/lib/config/dockerSecret.js +++ b/lib/config/dockerSecret.js @@ -53,7 +53,8 @@ if (fs.existsSync(basePath)) { }, google: { clientID: getSecret('google_clientID'), - clientSecret: getSecret('google_clientSecret') + clientSecret: getSecret('google_clientSecret'), + hostedDomain: getSecret('google_hostedDomain') }, imgur: getSecret('imgur_clientid') } diff --git a/lib/config/environment.js b/lib/config/environment.js index 944a2fb2..219be499 100644 --- a/lib/config/environment.js +++ b/lib/config/environment.js @@ -101,7 +101,8 @@ module.exports = { }, google: { clientID: process.env.CMD_GOOGLE_CLIENTID, - clientSecret: process.env.CMD_GOOGLE_CLIENTSECRET + clientSecret: process.env.CMD_GOOGLE_CLIENTSECRET, + hostedDomain: process.env.CMD_GOOGLE_HOSTEDDOMAIN }, ldap: { providerName: process.env.CMD_LDAP_PROVIDERNAME, |