[NEW] Alert admins when user requires approval & alert users when the account is approved/activated/deactivated

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -48,10 +48,19 @@
   "Accounts_denyUnverifiedEmail": "Deny unverified email",
   "Accounts_EmailVerification": "Email Verification",
   "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature",
+  "Accounts_Email_Approved": "[name]<br/><br/><p>Your account was approved.</p>",
+  "Accounts_Email_Activated": "[name]<br/><br/><p>Your account was activated.</p>",
+  "Accounts_Email_Deactivated": "[name]<br/><br/><p>Your account was deactivated.</p>",
+  "Accounts_Email_Approved_Subject": "Account approved",
+  "Accounts_Email_Activated_Subject": "Account activated",
+  "Accounts_Email_Deactivated_Subject": "Account deactivated",
   "Accounts_Enrollment_Email": "Enrollment Email",
   "Accounts_Enrollment_Email_Default": "<h2>Welcome to <h1>[Site_Name]</h1></h2><p>Go to <a href=\"[Site_URL]\"><a href=\"[Site_URL]\">[Site_URL]</a></a> and try the best open source chat solution available today!</p>",
   "Accounts_Enrollment_Email_Description": "You may use the following placeholders: <br /><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Welcome to [Site_Name]",
+  "Accounts_Admin_Email_Approval_Needed_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Reason: <b>[reason]</b></p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "A new user registered and needs approval",
   "Accounts_ForgetUserSessionOnWindowClose": "Forget User Session on Window Close",
   "Accounts_Iframe_api_method": "Api Method",
   "Accounts_Iframe_api_url": "API URL",
@@ -938,6 +947,7 @@
   "Invalid_name": "The name must not be empty",
   "Invalid_notification_setting_s": "Invalid notification setting: %s",
   "Invalid_pass": "The password must not be empty",
+  "Invalid_reason": "The reason to join must not be empty",
   "Invalid_room_name": "<strong>%s</strong> is not a valid room name",
   "Invalid_secret_URL_message": "The URL provided is invalid.",
   "Invalid_setting_s": "Invalid setting: %s",
@@ -1528,6 +1538,7 @@
   "Read_only_changed_successfully": "Read only changed successfully",
   "Read_only_channel": "Read Only Channel",
   "Read_only_group": "Read Only Group",
+  "Reason_To_Join": "Reason to Join",
   "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
   "Receive_alerts": "Receive alerts",
   "Record": "Record",

packages/rocketchat-lib/lib/placeholders.js

@@ -16,6 +16,7 @@ RocketChat.placeholders.replace = function(str, data) {
 		str = str.replace(/\[lname\]/g, s.strRightBack(data.name, ' ') || '');
 		str = str.replace(/\[email\]/g, data.email || '');
 		str = str.replace(/\[password\]/g, data.password || '');
+		str = str.replace(/\[reason\]/g, data.reason || '');
 		str = str.replace(/\[User\]/g, data.user || '');
 		str = str.replace(/\[Room\]/g, data.room || '');
 

packages/rocketchat-lib/server/functions/getFullUserData.js

@@ -9,7 +9,8 @@ RocketChat.getFullUserData = function({userId, filter, limit}) {
 		status: 1,
 		utcOffset: 1,
 		type: 1,
-		active: 1
+		active: 1,
+		reason: 1
 	};
 
 	if (RocketChat.authz.hasPermission(userId, 'view-full-other-user-info')) {

packages/rocketchat-lib/server/models/Users.js

@@ -507,6 +507,26 @@ class ModelUsers extends RocketChat.models._Base {
 		return this.update({ _id }, update);
 	}
 
+	setReason(_id, reason) {
+		const update = {
+			$set: {
+				reason
+			}
+		};
+
+		return this.update(_id, update);
+	}
+
+	unsetReason(_id) {
+		const update = {
+			$unset: {
+				reason: true
+			}
+		};
+
+		return this.update(_id, update);
+	}
+
 	// INSERT
 	create(data) {
 		const user = {

packages/rocketchat-lib/server/startup/settings.js

@@ -107,6 +107,7 @@ RocketChat.settings.addGroup('Accounts', function() {
 			}
 		});
 		this.add('Accounts_ManuallyApproveNewUsers', false, {
+			'public': true,
 			type: 'boolean'
 		});
 		this.add('Accounts_AllowedDomainsList', '', {

packages/rocketchat-ui-flextab/client/tabs/userInfo.html

@@ -65,7 +65,7 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
 									{{#each phone}} <a href="tel:{{phoneNumber}}" class="rc-user-info-details__info">{{phoneNumber}}</a> {{/each}}
 								</div>
 							{{/if}}
-							{{#if lastLogin}}
+							{{#if createdAt}}
 								<div class="rc-user-info-details__item">
 									<label class="rc-user-info-details__label	">{{_ "Created_at"}}</label>
 									<p class="rc-user-info-details__info">{{createdAt}}</p>
@@ -75,6 +75,12 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
 									<p class="rc-user-info-details__info">{{lastLogin}}</p>
 								</div>
 							{{/if}}
+							{{#if shouldDisplayReason}}
+								<div class="rc-user-info-details__item">
+									<label class="rc-user-info-details__label	">{{_ "Reason_To_Join"}}</label>
+									<p class="rc-user-info-details__info">{{user.reason}}</p>
+								</div>
+							{{/if}}
 						{{/if}}
 						{{#if utc}}
 							<div class="rc-user-info-details__item">

packages/rocketchat-ui-flextab/client/tabs/userInfo.js

@@ -155,6 +155,11 @@ Template.userInfo.helpers({
 		const roomRoles = RoomRoles.findOne({'u._id': user._id, rid: Session.get('openedRoom') }) || {};
 		const roles = _.union(userRoles.roles || [], roomRoles.roles || []);
 		return roles.length && RocketChat.models.Roles.find({ _id: { $in: roles }, description: { $exists: 1 } }, { fields: { description: 1 } });
+	},
+
+	shouldDisplayReason() {
+		const user = Template.instance().user.get();
+		return RocketChat.settings.get('Accounts_ManuallyApproveNewUsers') && user.active === false && user.reason;
 	}
 });
 /* globals isRtl popover */

packages/rocketchat-ui-login/client/login/form.html

@@ -28,21 +28,21 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 											autocapitalize="off" autocorrect="off"
 											placeholder="{{emailOrUsernamePlaceholder}}" autofocus>
 										<div class="input-error"></div>
-										</div>
-									</label>
-									{{#if hasOnePassword}}
-										<div class="one-passsword"></div>
-									{{/if}}
+									</div>
+								</label>
+								{{#if hasOnePassword}}
+									<div class="one-passsword"></div>
+								{{/if}}
 							</div>
 							<div class="rc-input">
 								<label class="rc-input__label" for="pass">
 									<div class="rc-input__wrapper">
 										<input name="pass" id="pass" type="password" class="rc-input__element"
 											autocapitalize="off" autocorrect="off"
 											placeholder="{{passwordPlaceholder}}" autofocus>
-											<div class="input-error"></div>
-										</div>
-									</label>
+										<div class="input-error"></div>
+									</div>
+								</label>
 							</div>
 						{{/if}}
 						{{#if state 'register'}}
@@ -58,10 +58,10 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 						</div>
 						<div class="rc-input">
 							<label class="rc-input__label" for="email">
-							<div class="rc-input__wrapper">
-								<input name="email" id="email" type="text" class="rc-input__element"
-									autocapitalize="off" autocorrect="off"
-									placeholder="{{_ "Email"}}" autofocus>
+								<div class="rc-input__wrapper">
+									<input name="email" id="email" type="text" class="rc-input__element"
+										autocapitalize="off" autocorrect="off"
+										placeholder="{{_ "Email"}}" autofocus>
 									<div class="input-error"></div>
 								</div>
 							</label>
@@ -75,9 +75,9 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 										<input name="pass" id="pass" type="password" class="rc-input__element"
 											autocapitalize="off" autocorrect="off"
 											placeholder="{{passwordPlaceholder}}" autofocus>
-											<div class="input-error"></div>
-										</div>
-									</label>
+										<div class="input-error"></div>
+									</div>
+								</label>
 							</div>
 							{{#if requirePasswordConfirmation}}
 							<div class="rc-input">
@@ -86,10 +86,22 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 										<input name="confirm-pass" id="confirm-pass" type="password" class="rc-input__element"
 											autocapitalize="off" autocorrect="off"
 											placeholder="{{passwordPlaceholder}}" autofocus>
+										<div class="input-error"></div>
+									</div>
+								</label>
+							</div>
+							{{/if}}
+							{{#if manuallyApproveNewUsers}}
+								<div class="rc-input">
+									<label class="rc-input__label" for="confirm-pass">
+										<div class="rc-input__wrapper">
+											<input name="reason" id="reason" type="text" class="rc-input__element"
+												autocapitalize="off" autocorrect="off"
+												placeholder="{{_ 'Reason_To_Join'}}" autofocus>
 											<div class="input-error"></div>
 										</div>
 									</label>
-							</div>
+								</div>
 							{{/if}}
 						{{/if}}
 						{{#if state 'forgot-password' 'email-verification'}}

packages/rocketchat-ui-login/client/login/form.js

@@ -60,6 +60,9 @@ Template.loginForm.helpers({
 	},
 	hasOnePassword() {
 		return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
+	},
+	manuallyApproveNewUsers() {
+		return RocketChat.settings.get('Accounts_ManuallyApproveNewUsers');
 	}
 });
 
@@ -252,6 +255,9 @@ Template.loginForm.onCreated(function() {
 			if (RocketChat.settings.get('Accounts_RequirePasswordConfirmation') && formObj['confirm-pass'] !== formObj['pass']) {
 				validationObj['confirm-pass'] = t('Invalid_confirm_pass');
 			}
+			if (RocketChat.settings.get('Accounts_ManuallyApproveNewUsers') && !formObj['reason']) {
+				validationObj['reason'] = t('Invalid_reason');
+			}
 			validateCustomFields(formObj, validationObj);
 		}
 		$('#login-card h2').removeClass('error');

server/lib/accounts.js

@@ -12,6 +12,54 @@ Accounts.emailTemplates.siteName = RocketChat.settings.get('Site_Name');
 
 Accounts.emailTemplates.from = `${ RocketChat.settings.get('Site_Name') } <${ RocketChat.settings.get('From_Email') }>`;
 
+Accounts.emailTemplates.userToActivate = {
+	subject() {
+		const subject = TAPi18n.__('Accounts_Admin_Email_Approval_Needed_Subject_Default');
+		const siteName = RocketChat.settings.get('Site_Name');
+
+		return `[${ siteName }] ${ subject }`;
+	},
+
+	html(options = {}) {
+		const header = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Header') || '');
+		const footer = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Footer') || '');
+
+		const email = options.reason ? 'Accounts_Admin_Email_Approval_Needed_With_Reason_Default' : 'Accounts_Admin_Email_Approval_Needed_Default';
+
+		const html = RocketChat.placeholders.replace(TAPi18n.__(email), {
+			name: options.name,
+			email: options.email,
+			reason: options.reason
+		});
+
+		return header + html + footer;
+	}
+};
+
+Accounts.emailTemplates.userActivated = {
+	subject({active, username}) {
+		const action = active ? (username ? 'Activated' : 'Approved') : 'Deactivated';
+		const subject = `Accounts_Email_${ action }_Subject`;
+		const siteName = RocketChat.settings.get('Site_Name');
+
+		return `[${ siteName }] ${ TAPi18n.__(subject) }`;
+	},
+
+	html({active, name, username}) {
+		const header = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Header') || '');
+		const footer = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Footer') || '');
+
+		const action = active ? (username ? 'Activated' : 'Approved') : 'Deactivated';
+
+		const html = RocketChat.placeholders.replace(TAPi18n.__(`Accounts_Email_${ action }`), {
+			name
+		});
+
+		return header + html + footer;
+	}
+};
+
+
 const verifyEmailHtml = Accounts.emailTemplates.verifyEmail.text;
 
 Accounts.emailTemplates.verifyEmail.html = function(user, url) {
@@ -94,6 +142,27 @@ Accounts.onCreateUser(function(options, user = {}) {
 		}
 	}
 
+	if (!user.active) {
+		const destinations = [];
+
+		RocketChat.models.Roles.findUsersInRole('admin').forEach(adminUser => {
+			if (Array.isArray(adminUser.emails)) {
+				adminUser.emails.forEach(email => {
+					destinations.push(`${ adminUser.name }<${ email.address }>`);
+				});
+			}
+		});
+
+		const email = {
+			to: destinations,
+			from: RocketChat.settings.get('From_Email'),
+			subject: Accounts.emailTemplates.userToActivate.subject(),
+			html: Accounts.emailTemplates.userToActivate.html(options)
+		};
+
+		Meteor.defer(() => Email.send(email));
+	}
+
 	return user;
 });
 

server/methods/registerUser.js

@@ -4,6 +4,7 @@ Meteor.methods({
 	registerUser(formData) {
 		const AllowAnonymousRead = RocketChat.settings.get('Accounts_AllowAnonymousRead');
 		const AllowAnonymousWrite = RocketChat.settings.get('Accounts_AllowAnonymousWrite');
+		const manuallyApproveNewUsers = RocketChat.settings.get('Accounts_ManuallyApproveNewUsers');
 		if (AllowAnonymousRead === true && AllowAnonymousWrite === true && formData.email == null) {
 			const userId = Accounts.insertUserDoc({}, {
 				globalRoles: [
@@ -19,7 +20,8 @@ Meteor.methods({
 				email: String,
 				pass: String,
 				name: String,
-				secretURL: Match.Optional(String)
+				secretURL: Match.Optional(String),
+				reason: Match.Optional(String)
 			}));
 		}
 
@@ -33,7 +35,9 @@ Meteor.methods({
 
 		const userData = {
 			email: s.trim(formData.email.toLowerCase()),
-			password: formData.pass
+			password: formData.pass,
+			name: formData.name,
+			reason: formData.reason
 		};
 
 		// Check if user has already been imported and never logged in. If so, set password and let it through
@@ -48,6 +52,11 @@ Meteor.methods({
 
 		RocketChat.models.Users.setName(userId, s.trim(formData.name));
 
+		const reason = s.trim(formData.reason);
+		if (manuallyApproveNewUsers && reason) {
+			RocketChat.models.Users.setReason(userId, reason);
+		}
+
 		RocketChat.saveCustomFields(userId, formData);
 
 		try {

server/methods/setUserActiveStatus.js

@@ -26,6 +26,21 @@ Meteor.methods({
 
 			if (active === false) {
 				RocketChat.models.Users.unsetLoginTokens(userId);
+			} else {
+				RocketChat.models.Users.unsetReason(userId);
+			}
+
+			const destinations = Array.isArray(user.emails) && user.emails.map(email => `${ user.name || user.username }<${ email.address }>`);
+
+			if (destinations) {
+				const email = {
+					to: destinations,
+					from: RocketChat.settings.get('From_Email'),
+					subject: Accounts.emailTemplates.userActivated.subject({active}),
+					html: Accounts.emailTemplates.userActivated.html({active, name: user.name, username: user.username})
+				};
+
+				Meteor.defer(() => Email.send(email));
 			}
 
 			return true;

tests/data/user.js

@@ -1,6 +1,7 @@
 export const username = `user.test.${ Date.now() }`;
 export const email = `${ username }@rocket.chat`;
 export const password = 'rocket.chat';
+export const reason = 'rocket.chat.reason';
 
 export const adminUsername = 'rocketchat.internal.admin.test';
 export const adminEmail = `${ adminUsername }@rocket.chat`;