diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-05-23 11:43:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 11:43:10 +0300 |
commit | d067b3976c43afce60af96b9829fb8d53bc62b3c (patch) | |
tree | 4f18a2629f7409a1e36edb3607fe6253ef72310a /packages/wekan-oidc | |
parent | d83cb75f95e94524e1117111ca0dd063021cf3b8 (diff) | |
parent | 892ee605270d583d800ec5ff9e1e4844eae92b38 (diff) | |
download | wekan-d067b3976c43afce60af96b9829fb8d53bc62b3c.tar.gz wekan-d067b3976c43afce60af96b9829fb8d53bc62b3c.tar.bz2 wekan-d067b3976c43afce60af96b9829fb8d53bc62b3c.zip |
Merge pull request #2427 from DominikPf/OAuth2-fix
Fix Scope parsing Issue for OAuth2 Login with simple String
Diffstat (limited to 'packages/wekan-oidc')
-rw-r--r-- | packages/wekan-oidc/oidc_client.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/wekan-oidc/oidc_client.js b/packages/wekan-oidc/oidc_client.js index 744bd841..6da9d9f0 100644 --- a/packages/wekan-oidc/oidc_client.js +++ b/packages/wekan-oidc/oidc_client.js @@ -18,10 +18,9 @@ Oidc.requestCredential = function (options, credentialRequestCompleteCallback) { new ServiceConfiguration.ConfigError('Service oidc not configured.')); return; } - + var credentialToken = Random.secret(); var loginStyle = OAuth._loginStyle('oidc', config, options); - var scope = config.requestPermissions || ['openid', 'profile', 'email']; // options options = options || {}; @@ -29,7 +28,7 @@ Oidc.requestCredential = function (options, credentialRequestCompleteCallback) { options.response_type = options.response_type || 'code'; options.redirect_uri = OAuth._redirectUri('oidc', config); options.state = OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl); - options.scope = scope.join(' '); + options.scope = config.requestPermissions || 'openid profile email'; if (config.loginStyle && config.loginStyle == 'popup') { options.display = 'popup'; |