Browse Source

Try to fix OIDC login.

Thanks to xet7 !
Lauri Ojansivu 6 years ago
parent
commit
8b31c0768c
2 changed files with 10 additions and 8 deletions
  1. 6 6
      packages/wekan-oidc/oidc_server.js
  2. 4 2
      server/authentication.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 {

+ 4 - 2
server/authentication.js

@@ -76,9 +76,11 @@ Meteor.startup(() => {
             authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
             authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
             userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
             userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
             tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
             tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
-            idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
-            requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS || 'openid profile email',
+            idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS,
+            requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS,
           },
           },
+          // OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
+          // OAUTH2_REQUEST_PERMISSIONS || 'openid profile email',
         }
         }
       );
       );
     }
     }