|
@@ -15,6 +15,8 @@ module.exports = function(crowi) {
|
|
|
|
|
|
|
|
, PAGE_ITEMS = 20
|
|
, PAGE_ITEMS = 20
|
|
|
|
|
|
|
|
|
|
+ , userEvent = crowi.event('user')
|
|
|
|
|
+
|
|
|
, userSchema;
|
|
, userSchema;
|
|
|
|
|
|
|
|
userSchema = new mongoose.Schema({
|
|
userSchema = new mongoose.Schema({
|
|
@@ -34,6 +36,8 @@ module.exports = function(crowi) {
|
|
|
});
|
|
});
|
|
|
userSchema.plugin(mongoosePaginate);
|
|
userSchema.plugin(mongoosePaginate);
|
|
|
|
|
|
|
|
|
|
+ userEvent.on('activated', userEvent.onActivated);
|
|
|
|
|
+
|
|
|
function decideUserStatusOnRegistration () {
|
|
function decideUserStatusOnRegistration () {
|
|
|
var Config = crowi.model('Config'),
|
|
var Config = crowi.model('Config'),
|
|
|
config = crowi.getConfig();
|
|
config = crowi.getConfig();
|
|
@@ -161,6 +165,7 @@ module.exports = function(crowi) {
|
|
|
this.username = username;
|
|
this.username = username;
|
|
|
this.status = STATUS_ACTIVE;
|
|
this.status = STATUS_ACTIVE;
|
|
|
this.save(function(err, userData) {
|
|
this.save(function(err, userData) {
|
|
|
|
|
+ userEvent.emit('activated', userData);
|
|
|
return callback(err, userData);
|
|
return callback(err, userData);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
@@ -185,6 +190,7 @@ module.exports = function(crowi) {
|
|
|
debug('Activate User', this);
|
|
debug('Activate User', this);
|
|
|
this.status = STATUS_ACTIVE;
|
|
this.status = STATUS_ACTIVE;
|
|
|
this.save(function(err, userData) {
|
|
this.save(function(err, userData) {
|
|
|
|
|
+ userEvent.emit('activated', userData);
|
|
|
return callback(err, userData);
|
|
return callback(err, userData);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
@@ -535,6 +541,9 @@ module.exports = function(crowi) {
|
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
|
|
|
|
|
|
newUser.save(function(err, userData) {
|
|
newUser.save(function(err, userData) {
|
|
|
|
|
+ if (userData.status == STATUS_ACTIVE) {
|
|
|
|
|
+ userEvent.emit('activated', userData);
|
|
|
|
|
+ }
|
|
|
return callback(err, userData);
|
|
return callback(err, userData);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
@@ -552,6 +561,9 @@ module.exports = function(crowi) {
|
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
|
|
|
|
|
|
newUser.save(function(err, userData) {
|
|
newUser.save(function(err, userData) {
|
|
|
|
|
+ if (userData.status == STATUS_ACTIVE) {
|
|
|
|
|
+ userEvent.emit('activated', userData);
|
|
|
|
|
+ }
|
|
|
return callback(err, userData);
|
|
return callback(err, userData);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|