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

- Remove OAuth2, until it is fixed.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2018-09-17 13:23:08 +03:00
parent 2e52ff9e9d
commit 53a020a23a
4 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.meteor/packages
View file

@ -31,7 +31,7 @@ kenton:accounts-sandstorm
service-configuration@1.0.11
useraccounts:unstyled
useraccounts:flow-routing
salleman:accounts-oidc
#salleman:accounts-oidc
# Utilities
check@1.2.5

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
This release removes the following new features:
- Remove IFTTT rules, until they are fixed.
- Remove OAuth2, until it is fixed.
Thanks to GitHub user xet7 for contributions.

46
models/users.js
View file

@ -488,29 +488,29 @@ if (Meteor.isServer) {
return user;
}
if (user.services.oidc) {
const email = user.services.oidc.email.toLowerCase();
user.username = user.services.oidc.username;
user.emails = [{ address: email, verified: true }];
const initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
user.profile = { initials, fullname: user.services.oidc.fullname };
// see if any existing user has this email address or username, otherwise create new
const existingUser = Meteor.users.findOne({$or: [{'emails.address': email}, {'username':user.username}]});
if (!existingUser)
return user;
// copy across new service info
const 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 (user.services.oidc) {
// const email = user.services.oidc.email.toLowerCase();
//
// user.username = user.services.oidc.username;
// user.emails = [{ address: email, verified: true }];
// const initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
// user.profile = { initials, fullname: user.services.oidc.fullname };
//
// // see if any existing user has this email address or username, otherwise create new
// const existingUser = Meteor.users.findOne({$or: [{'emails.address': email}, {'username':user.username}]});
// if (!existingUser)
// return user;
//
// // copy across new service info
// const 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;

45
server/authentication.js
View file

@ -62,28 +62,27 @@ Meteor.startup(() => {
Authentication.checkAdminOrCondition(userId, normalAccess);
};
if (Meteor.isServer) {
if(process.env.OAUTH2_CLIENT_ID !== '') {
ServiceConfiguration.configurations.upsert( // eslint-disable-line no-undef
{ service: 'oidc' },
{
$set: {
loginStyle: 'redirect',
clientId: process.env.OAUTH2_CLIENT_ID,
secret: process.env.OAUTH2_SECRET,
serverUrl: process.env.OAUTH2_SERVER_URL,
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
idTokenWhitelistFields: [],
requestPermissions: ['openid'],
},
}
);
}
}
// if (Meteor.isServer) {
//
// if(process.env.OAUTH2_CLIENT_ID !== '') {
//
// ServiceConfiguration.configurations.upsert( // eslint-disable-line no-undef
// { service: 'oidc' },
// {
// $set: {
// loginStyle: 'redirect',
// clientId: process.env.OAUTH2_CLIENT_ID,
// secret: process.env.OAUTH2_SECRET,
// serverUrl: process.env.OAUTH2_SERVER_URL,
// authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
// userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
// tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
// idTokenWhitelistFields: [],
// requestPermissions: ['openid'],
// },
// }
// );
// }
// }
});