github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

merge oidc and local account if exists

Browse source
This commit is contained in:
Allemand Sylvain 2018-04-10 11:44:54 +02:00
parent 1c8a00943c
commit 3e927b4e58
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
models/users.js
View file

@ -460,15 +460,31 @@ if (Meteor.isServer) {
}
if (user.services.oidc) {
var email = user.services.oidc.email.toLowerCase();
user.username = user.services.oidc.username;
user.emails = [{
address: user.services.oidc.email.toLowerCase(),
verified: false,
}];
const initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
user.emails = [{ address: email,
verified: true }];
var initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
user.profile = { initials: initials, fullname: user.services.oidc.fullname };
}
// see if any existing user has this email address or username, otherwise create new
var existingUser = Meteor.users.findOne({$or: [{'emails.address': email}, {'username':user.username}]});
console.log("user to create : ");
console.log(user);
if (!existingUser)
return user;
// copy across new service info
var service = _.keys(user.services)[0];
existingUser.services[service] = user.services[service];
existingUser.emails = user.emails;
existingUser.username = user.username;
existingUser.profile = user.profile;
Meteor.users.remove({_id: existingUser._id}); // remove existing record
return existingUser;
}
if (options.from === 'admin') {
user.createdThroughApi = true;