瀏覽代碼

Merge pull request #2385 from faust64/patch-1

fix(oidc): can not log in
Lauri Ojansivu 6 年之前
父節點
當前提交
723fa11a74
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      packages/wekan-oidc/oidc_server.js

+ 6 - 6
packages/wekan-oidc/oidc_server.js

@@ -13,12 +13,12 @@ OAuth.registerService('oidc', 2, null, function (query) {
   if (debug) console.log('XXX: userinfo:', userinfo);
   if (debug) console.log('XXX: userinfo:', userinfo);
 
 
   var serviceData = {};
   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.accessToken = accessToken;
   serviceData.expiresAt = expiresAt;
   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) {
   if (accessToken) {
     var tokenContent = getTokenContent(accessToken);
     var tokenContent = getTokenContent(accessToken);
@@ -31,8 +31,8 @@ OAuth.registerService('oidc', 2, null, function (query) {
   if (debug) console.log('XXX: serviceData:', serviceData);
   if (debug) console.log('XXX: serviceData:', serviceData);
 
 
   var profile = {};
   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);
   if (debug) console.log('XXX: profile:', profile);
 
 
   return {
   return {