Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

- Remove mouse scroll settings of already removed custom scrollbar.

Browse source 
- Add setting OAUTH2_ADFS_ENABLED=false
- Add testing for both string and boolean version of true

Thanks to xet7 !

Fixes #2949
This commit is contained in:
Lauri Ojansivu 2020-09-13 09:41:53 +03:00
parent 67a58daaf3
commit f6bdb4d694
13 changed files with 458 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/wekan-oidc/oidc_server.js
View file

@ -9,9 +9,9 @@ OAuth.registerService('oidc', 2, null, function (query) {
var accessToken = token.access_token || token.id_token;
var expiresAt = (+new Date) + (1000 * parseInt(token.expires_in, 10));
var claimsInAccessToken = process.env.OAUTH2_ADFS || false;
var userinfo;
var claimsInAccessToken = (process.env.OAUTH2_ADFS_ENABLED === 'true' || process.env.OAUTH2_ADFS_ENABLED === true) || false;
var userinfo;
if(claimsInAccessToken)
{
// hack when using custom claims in the accessToken. On premise ADFS
@ -22,7 +22,7 @@ OAuth.registerService('oidc', 2, null, function (query) {
// normal behaviour, getting the claims from UserInfo endpoint.
userinfo = getUserInfo(accessToken);
}
if (userinfo.ocs) userinfo = userinfo.ocs.data; // Nextcloud hack
if (userinfo.metadata) userinfo = userinfo.metadata // Openshift hack
if (debug) console.log('XXX: userinfo:', userinfo);