summaryrefslogtreecommitdiffstats
path: root/models/users.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-10-09 15:57:42 +0300
committerLauri Ojansivu <x@xet7.org>2017-10-09 15:57:42 +0300
commit33cea113933083380b5c06b1f32e50fe778d8cfc (patch)
treeba71595776bf8139b45aad10693a6cb52e9c3311 /models/users.js
parent10cb2db94f4a6bb8160d4250a4a44be766398ace (diff)
parentad607c1291c38df26e51c03113a49ca8112b32ec (diff)
downloadwekan-33cea113933083380b5c06b1f32e50fe778d8cfc.tar.gz
wekan-33cea113933083380b5c06b1f32e50fe778d8cfc.tar.bz2
wekan-33cea113933083380b5c06b1f32e50fe778d8cfc.zip
Merge branch 'fix-admin-create-user' of https://github.com/soohwa/wekan into soohwa-fix-admin-create-user
Diffstat (limited to 'models/users.js')
-rw-r--r--models/users.js24
1 files changed, 23 insertions, 1 deletions
diff --git a/models/users.js b/models/users.js
index c2238cde..3d4ff935 100644
--- a/models/users.js
+++ b/models/users.js
@@ -108,6 +108,10 @@ Users.attachSchema(new SimpleSchema({
type: Boolean,
optional: true,
},
+ createdThroughApi: {
+ type: Boolean,
+ optional: true,
+ },
}));
// Search a user in the complete server database by its name or username. This
@@ -435,6 +439,12 @@ if (Meteor.isServer) {
user.isAdmin = true;
return user;
}
+
+ if (options.from === 'admin') {
+ user.createdThroughApi = true;
+ return user;
+ }
+
const disableRegistration = Settings.findOne().disableRegistration;
if (!disableRegistration) {
return user;
@@ -524,6 +534,17 @@ if (Meteor.isServer) {
Users.after.insert((userId, doc) => {
+ if (doc.createdThroughApi) {
+ // The admin user should be able to create a user despite disabling registration because
+ // it is two different things (registration and creation).
+ // So, when a new user is created via the api (only admin user can do that) one must avoid
+ // the disableRegistration check.
+ // Issue : https://github.com/wekan/wekan/issues/1232
+ // PR : https://github.com/wekan/wekan/pull/1251
+ Users.update(doc._id, { $set: { createdThroughApi: '' } });
+ return;
+ }
+
//invite user to corresponding boards
const disableRegistration = Settings.findOne().disableRegistration;
if (disableRegistration) {
@@ -581,7 +602,8 @@ if (Meteor.isServer) {
const id = Accounts.createUser({
username: req.body.username,
email: req.body.email,
- password: 'default',
+ password: req.body.password,
+ from: 'admin',
});
JsonRoutes.sendResult(res, {