[NEW] Option to reset e2e key

packages/rocketchat-authorization/server/startup.js

@@ -46,6 +46,7 @@ Meteor.startup(function() {
 		{ _id: 'mention-here',                  roles : ['admin', 'owner', 'moderator', 'user'] },
 		{ _id: 'mute-user',                     roles : ['admin', 'owner', 'moderator'] },
 		{ _id: 'remove-user',                   roles : ['admin', 'owner', 'moderator'] },
+		{ _id: 'reset-other-user-e2e-key',      roles : ['admin'] },
 		{ _id: 'run-import',                    roles : ['admin'] },
 		{ _id: 'run-migration',                 roles : ['admin'] },
 		{ _id: 'set-moderator',                 roles : ['admin', 'owner'] },

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

@@ -34,3 +34,11 @@ RocketChat.models.Users.findByIdsWithPublicE2EKey = function(ids, options) {
 
 	return this.find(query, options);
 };
+
+RocketChat.models.Users.resetE2EKey = function(userId) {
+	this.update({ _id: userId }, {
+		$unset: {
+			e2e: '',
+		},
+	});
+};

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

@@ -2206,6 +2206,8 @@
   "Require_password_change": "Require password change",
   "Resend_verification_email": "Resend verification email",
   "Reset": "Reset",
+  "Reset_E2E_Key": "Reset E2E Key",
+  "reset-other-user-e2e-key": "Reset Other User E2E Key",
   "Reset_password": "Reset password",
   "Reset_section_settings": "Reset Section Settings",
   "Reset_Connection": "Reset Connection",
@@ -2719,6 +2721,7 @@
   "User_and_group_mentions_only": "User and group mentions only",
   "User_default": "User default",
   "User_doesnt_exist": "No user exists by the name of `@%s`.",
+  "User_e2e_key_was_reset": "User E2E key was reset successfully.",
   "User_has_been_activated": "User has been activated",
   "User_has_been_deactivated": "User has been deactivated",
   "User_has_been_deleted": "User has been deleted",

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

@@ -477,6 +477,21 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 				name: t('Activate'),
 				action: prevent(getUser, ({ _id }) => Meteor.call('setUserActiveStatus', _id, true, success(() => toastr.success(t('User_has_been_activated'))))),
 			};
+		}, () => {
+			if (hideAdminControls || !hasPermission('reset-other-user-e2e-key')) {
+				return;
+			}
+			if (!RocketChat.settings.get('E2E_Enable')) {
+				return;
+			}
+
+			return {
+				group: 'admin',
+				icon: 'key',
+				id: 'reset-e2e',
+				name: t('Reset_E2E_Key'),
+				action: prevent(getUser, ({ _id }) => Meteor.call('resetUserE2EKey', _id, success(() => toastr.success(t('User_e2e_key_was_reset'))))),
+			};
 		}];
 	return actions;
 };

server/methods/resetUserE2EKey.js

@@ -0,0 +1,20 @@
+Meteor.methods({
+	resetUserE2EKey(userId) {
+		check(userId, String);
+
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'resetUserE2EKey',
+			});
+		}
+
+		if (RocketChat.authz.hasPermission(Meteor.userId(), 'reset-other-user-e2e-key') !== true) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+				method: 'resetUserE2EKey',
+			});
+		}
+
+		RocketChat.models.Users.resetE2EKey(userId);
+		return true;
+	},
+});