2
0
Эх сурвалжийг харах

fix userwas used before assignment

viehlieb 3 жил өмнө
parent
commit
db6fc57515

+ 3 - 2
packages/wekan-oidc/oidc_server.js

@@ -18,6 +18,7 @@ if (process.env.OAUTH2_CA_CERT !== undefined) {
 OAuth.registerService('oidc', 2, null, function (query) {
 OAuth.registerService('oidc', 2, null, function (query) {
 
 
   var debug = process.env.DEBUG || false;
   var debug = process.env.DEBUG || false;
+  console.log(process.env);
   var propagateOidcData = process.env.PROPAGATE_OIDC_DATA || false;
   var propagateOidcData = process.env.PROPAGATE_OIDC_DATA || false;
 
 
   var token = getToken(query);
   var token = getToken(query);
@@ -79,12 +80,12 @@ OAuth.registerService('oidc', 2, null, function (query) {
   profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
   profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
   if (propagateOidcData)
   if (propagateOidcData)
   {
   {
+    users= Meteor.users;
+    user = users.findOne({'services.oidc.id':  serviceData.id});
     if(user)
     if(user)
     {
     {
       serviceData.groups = profile.groups
       serviceData.groups = profile.groups
       profile.groups = userinfo["groups"];
       profile.groups = userinfo["groups"];
-      users= Meteor.users;
-      user = users.findOne({'services.oidc.id':  serviceData.id});
       if(userinfo["groups"]) addGroups(user, userinfo["groups"]);
       if(userinfo["groups"]) addGroups(user, userinfo["groups"]);
       if(profile.email) addEmail(user, profile.email)
       if(profile.email) addEmail(user, profile.email)
       if(profile.name) changeFullname(user, profile.name)
       if(profile.name) changeFullname(user, profile.name)