Replaced old .admin is true by RocketChat.authz.hasRole(Meteor.userId(), 'admin')

Author: marceloschmidt

client/views/admin/users/adminInviteUser.coffee

@@ -1,14 +1,13 @@
 Template.adminInviteUser.helpers
 	isAdmin: ->
-		console.log 'isAdmin', Meteor.user().admin is true
-		return Meteor.user().admin is true
+		return RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 	emailEnabled: ->
 		console.log 'emailEnabled', RocketChat.settings.get('MAIL_URL') or (RocketChat.settings.get('SMTP_Host') and RocketChat.settings.get('SMTP_Username') and RocketChat.settings.get('SMTP_Password'))
 		return RocketChat.settings.get('MAIL_URL') or (RocketChat.settings.get('SMTP_Host') and RocketChat.settings.get('SMTP_Username') and RocketChat.settings.get('SMTP_Password'))
 	inviteEmails: ->
 		return Template.instance().inviteEmails.get()
 
-Template.adminInviteUser.events 
+Template.adminInviteUser.events
 	'click .send': (e, instance) ->
 		emails = $('#inviteEmails').val().split /[\s,;]/
 		rfcMailPattern = /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/

client/views/admin/users/adminUsers.coffee

@@ -23,7 +23,7 @@ Template.adminUsers.helpers
 		return RocketChat.TabBar.getData()
 
 	adminClass: ->
-		return 'admin' if Meteor.user()?.admin is true
+		return 'admin' if RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 
 Template.adminUsers.onCreated ->
 	instance = @
@@ -56,7 +56,7 @@ Template.adminUsers.onCreated ->
 			query = { $or: [ { username: filterReg }, { name: filterReg }, { "emails.address": filterReg } ] }
 		else
 			query = {}
-		
+
 		return Meteor.users.find(query, { limit: instance.limit?.get(), sort: { username: 1, name: 1 } }).fetch()
 
 Template.adminUsers.onRendered ->

client/views/app/room.coffee

@@ -229,7 +229,7 @@ Template.room.helpers
 		return RocketChat.TabBar.getData()
 
 	adminClass: ->
-		return 'admin' if Meteor.user()?.admin is true
+		return 'admin' if RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 
 Template.room.events
 	"touchstart .message": (e, t) ->

packages/rocketchat-lib/server/methods/sendInvitationEmail.coffee

@@ -3,20 +3,20 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'invalid-user', "[methods] sendInvitationEmail -> Invalid user"
 
-		unless Meteor.user()?.admin is true
+		unless RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 			throw new Meteor.Error 'not-authorized', '[methods] sendInvitationEmail -> Not authorized'
 
 		rfcMailPattern = /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
 		validEmails = _.compact _.map emails, (email) -> return email if rfcMailPattern.test email
-		
+
 		for email in validEmails
 			@unblock()
-			
+
 			Email.send
 				to: email
 				from: RocketChat.settings.get 'From_Email'
 				subject: RocketChat.settings.get 'Invitation_Subject'
 				html: RocketChat.settings.get 'Invitation_HTML'
 
 
-		return validEmails
+		return validEmails

server/lib/cordova.coffee

@@ -10,7 +10,7 @@ Meteor.startup ->
 		Push.enabled = true
 		Push.allow
 			send: (userId, notification) ->
-				return Meteor.users.findOne({_id: userId})?.admin is true
+				return RocketChat.authz.hasRole(userId, 'admin')
 
 		Push.Configure
 			apn:

server/methods/archiveRoom.coffee

@@ -7,7 +7,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne rid
 
-		if room.u? and room.u._id is Meteor.userId() or Meteor.user().admin?
+		if room.u? and room.u._id is Meteor.userId() or RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 			update =
 				$set:
 					archived: true

server/methods/unarchiveRoom.coffee

@@ -7,7 +7,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne rid
 
-		if room.u? and room.u._id is Meteor.userId() or Meteor.user().admin?
+		if room.u? and room.u._id is Meteor.userId() or RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 			update =
 				$set:
 					archived: false