From 5f3a1b626653d9b6331bfcb673d64324b29e2927 Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Sat, 20 Jun 2020 16:33:57 +0200 Subject: Backport of #278 for 1.6.1 This is a backport of #278 with the default value of `scope` changed to `undefined`. This is thus a fully backward-compatible change. Signed-off-by: Victor Berger --- lib/config/default.js | 3 ++- lib/config/environment.js | 3 ++- lib/config/hackmdEnvironment.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/config') diff --git a/lib/config/default.js b/lib/config/default.js index 7504fda2..9b852d1e 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -91,7 +91,8 @@ module.exports = { authorizationURL: undefined, tokenURL: undefined, clientID: undefined, - clientSecret: undefined + clientSecret: undefined, + scope: undefined }, facebook: { clientID: undefined, diff --git a/lib/config/environment.js b/lib/config/environment.js index 219be499..87a7e3ee 100644 --- a/lib/config/environment.js +++ b/lib/config/environment.js @@ -92,7 +92,8 @@ module.exports = { tokenURL: process.env.CMD_OAUTH2_TOKEN_URL, authorizationURL: process.env.CMD_OAUTH2_AUTHORIZATION_URL, clientID: process.env.CMD_OAUTH2_CLIENT_ID, - clientSecret: process.env.CMD_OAUTH2_CLIENT_SECRET + clientSecret: process.env.CMD_OAUTH2_CLIENT_SECRET, + scope: process.env.CMD_OAUTH2_SCOPE }, dropbox: { clientID: process.env.CMD_DROPBOX_CLIENTID, diff --git a/lib/config/hackmdEnvironment.js b/lib/config/hackmdEnvironment.js index dcfda0bc..d4ae77f0 100644 --- a/lib/config/hackmdEnvironment.js +++ b/lib/config/hackmdEnvironment.js @@ -81,7 +81,8 @@ module.exports = { tokenURL: process.env.HMD_OAUTH2_TOKEN_URL, authorizationURL: process.env.HMD_OAUTH2_AUTHORIZATION_URL, clientID: process.env.HMD_OAUTH2_CLIENT_ID, - clientSecret: process.env.HMD_OAUTH2_CLIENT_SECRET + clientSecret: process.env.HMD_OAUTH2_CLIENT_SECRET, + scope: process.env.HMD_OAUTH2_SCOPE }, dropbox: { clientID: process.env.HMD_DROPBOX_CLIENTID, -- cgit v1.2.3