diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-05-09 14:27:34 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-05-09 14:27:34 +0300 |
| commit | b6d7c71cc8a5ce47e1ba307b3be8506fac547e88 (patch) | |
| tree | 2bed496f470d881546b3394c15eb51d9f289c04e /packages | |
| parent | 778cd22e72f1894b85ae741ed3868a0d7a9732f3 (diff) | |
| parent | 434ed895eddb3836add1e23f0382cf0c5d3b9978 (diff) | |
| download | wekan-b6d7c71cc8a5ce47e1ba307b3be8506fac547e88.tar.gz wekan-b6d7c71cc8a5ce47e1ba307b3be8506fac547e88.tar.bz2 wekan-b6d7c71cc8a5ce47e1ba307b3be8506fac547e88.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 fb948c52..ec615cd1 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 { |