|
@@ -32,7 +32,7 @@ module.exports = function(app, models) {
|
|
|
|
|
|
|
|
function decideUserStatusOnRegistration () {
|
|
function decideUserStatusOnRegistration () {
|
|
|
// status decided depends on registrationMode
|
|
// status decided depends on registrationMode
|
|
|
- switch (config.crowi['security.registrationMode']) {
|
|
|
|
|
|
|
+ switch (config.crowi['security:registrationMode']) {
|
|
|
case 'Open':
|
|
case 'Open':
|
|
|
return STATUS_ACTIVE;
|
|
return STATUS_ACTIVE;
|
|
|
case 'Restricted':
|
|
case 'Restricted':
|
|
@@ -198,8 +198,8 @@ module.exports = function(app, models) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
userSchema.statics.isEmailValid = function(email, callback) {
|
|
userSchema.statics.isEmailValid = function(email, callback) {
|
|
|
- if (Array.isArray(config.crowi['security.registrationWhiteList'])) {
|
|
|
|
|
- return config.crowi['security.registrationWhiteList'].some(function(allowedEmail) {
|
|
|
|
|
|
|
+ if (Array.isArray(config.crowi['security:registrationWhiteList'])) {
|
|
|
|
|
+ return config.crowi['security:registrationWhiteList'].some(function(allowedEmail) {
|
|
|
var re = new RegExp(allowedEmail + '$');
|
|
var re = new RegExp(allowedEmail + '$');
|
|
|
return re.test(email);
|
|
return re.test(email);
|
|
|
});
|
|
});
|