summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-10-09 21:57:37 +0200
committerGitHub2018-10-09 21:57:37 +0200
commit5c4df14bbcba7518d8f599eff1782f853d8f0a83 (patch)
treebe76da09735bc72b56f6b6bfcd0c3476a8d58a0c
parent482a91e15d03107324330d20c853bad339004bb0 (diff)
parent3d1d03fa87c8ab788760fa74bae01f9dd917f019 (diff)
Merge pull request #990 from SISheogorath/fix/oauthProviderName
Make oauth2 provider name accessible
-rw-r--r--README.md1
-rw-r--r--lib/config/default.js1
-rw-r--r--lib/config/environment.js1
3 files changed, 3 insertions, 0 deletions
diff --git a/README.md b/README.md
index a8ebf60d..7aab06fe 100644
--- a/README.md
+++ b/README.md
@@ -237,6 +237,7 @@ There are some config settings you need to change in the files below.
| `CMD_OAUTH2_AUTHORIZATION_URL` | `https://example.com` | authorization URL of your provider, please refer to the documentation of your OAuth2 provider (no default value) |
| `CMD_OAUTH2_CLIENT_ID` | `afae02fckafd...` | you will get this from your OAuth2 provider when you register CodiMD as OAuth2-client, (no default value) |
| `CMD_OAUTH2_CLIENT_SECRET` | `afae02fckafd...` | you will get this from your OAuth2 provider when you register CodiMD as OAuth2-client, (no default value) |
+| `CMD_OAUTH2_PROVIDERNAME` | `My institution` | Optional name to be displayed at login form indicating the oAuth2 provider |
| `CMD_IMGUR_CLIENTID` | no example | Imgur API client id |
| `CMD_EMAIL` | `true` or `false` | set to allow email signin |
| `CMD_ALLOW_PDF_EXPORT` | `true` or `false` | Enable or disable PDF exports |
diff --git a/lib/config/default.js b/lib/config/default.js
index acfc2157..c3ada982 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -78,6 +78,7 @@ module.exports = {
},
// authentication
oauth2: {
+ providerName: undefined,
authorizationURL: undefined,
tokenURL: undefined,
clientID: undefined,
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 65bacb4e..6737637c 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -75,6 +75,7 @@ module.exports = {
clientSecret: process.env.CMD_MATTERMOST_CLIENTSECRET
},
oauth2: {
+ providerName: process.env.CMD_OAUTH2_PROVIDERNAME,
baseURL: process.env.CMD_OAUTH2_BASEURL,
userProfileURL: process.env.CMD_OAUTH2_USER_PROFILE_URL,
userProfileUsernameAttr: process.env.CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR,