Allow user with "bulk-register-user" permission to send invitation ma…

…ils (#12112)
RocketChat · Sep 25, 2018 · 82666e0 · 82666e0
1 parent 60a14e4
commit 82666e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/rocketchat-lib/server/methods/sendInvitationEmail.js b/packages/rocketchat-lib/server/methods/sendInvitationEmail.js
@@ -9,7 +9,7 @@ Meteor.methods({
 				method: 'sendInvitationEmail',
 			});
 		}
-		if (!RocketChat.authz.hasRole(Meteor.userId(), 'admin')) {
+		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'bulk-register-user')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 				method: 'sendInvitationEmail',
 			});

diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.html b/packages/rocketchat-ui-admin/client/users/adminInviteUser.html
@@ -1,5 +1,5 @@
 <template name="adminInviteUser">
-	{{#if isAdmin}}
+	{{#if isAllowed}}
 		<div class="content">
 			<div class="user-view">
 				<div class="about clearfix">

diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js
@@ -2,8 +2,8 @@ import _ from 'underscore';
 import toastr from 'toastr';
 
 Template.adminInviteUser.helpers({
-	isAdmin() {
-		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
+	isAllowed() {
+		return RocketChat.authz.hasAtLeastOnePermission('bulk-register-user');
 	},
 	inviteEmails() {
 		return Template.instance().inviteEmails.get();