diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-06-12 06:37:34 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-06-12 06:37:34 +0300 |
| commit | 38a238df80ea52d9fcbe48db4b43433651f61c0e (patch) | |
| tree | 562dd5f856b0fdf2e2a04641d34b1a4b7e7f0022 /packages | |
| parent | f154c0338572fa09b3134d177c76e534c5947ed4 (diff) | |
| parent | 79745d189270f08c3747447ea84839deb19ad0d6 (diff) | |
| download | wekan-38a238df80ea52d9fcbe48db4b43433651f61c0e.tar.gz wekan-38a238df80ea52d9fcbe48db4b43433651f61c0e.tar.bz2 wekan-38a238df80ea52d9fcbe48db4b43433651f61c0e.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/wekan-oidc/oidc_server.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index e826d1f5..326238da 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -13,12 +13,12 @@ OAuth.registerService('oidc', 2, null, function (query) { if (debug) console.log('XXX: userinfo:', userinfo); var serviceData = {}; - serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo["id"]; - serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo["uid"]; - serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; + serviceData.id = userinfo[process.env.OAUTH2_ID_MAP]; // || userinfo["id"]; + serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP]; // || userinfo["uid"]; + serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"]; serviceData.accessToken = accessToken; serviceData.expiresAt = expiresAt; - serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; + serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"]; if (accessToken) { var tokenContent = getTokenContent(accessToken); @@ -31,8 +31,8 @@ OAuth.registerService('oidc', 2, null, function (query) { if (debug) console.log('XXX: serviceData:', serviceData); var profile = {}; - profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; - profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; + profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"]; + profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"]; if (debug) console.log('XXX: profile:', profile); return { |