Merge pull request #1534 from RocketChat/permissions-renaming

Permissions renaming
RocketChat · Dec 1, 2015 · 62d50a7 · 62d50a7
2 parents 4777884 + 2a631f7
commit 62d50a7
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 23 deletions.
diff --git a/packages/rocketchat-authorization/client/route.coffee b/packages/rocketchat-authorization/client/route.coffee
@@ -1,21 +1,21 @@
 FlowRouter.route '/admin/permissions',
-	name: 'rocket-permissions'
+	name: 'admin-permissions'
 	action: (params) ->
 		BlazeLayout.render 'main',
 			center: 'pageContainer'
 			pageTitle: t('Permissions')
 			pageTemplate: 'permissions'
 
 FlowRouter.route '/admin/permissions/:name?/edit',
-	name: 'rocket-permissions-edit'
+	name: 'admin-permissions-edit'
 	action: (params) ->
 		BlazeLayout.render 'main',
 			center: 'pageContainer'
 			pageTitle: t('Role_Editing')
 			pageTemplate: 'permissionsRole'
 
 FlowRouter.route '/admin/permissions/new',
-	name: 'rocket-permissions-new'
+	name: 'admin-permissions-new'
 	action: (params) ->
 		BlazeLayout.render 'main',
 			center: 'pageContainer'

diff --git a/packages/rocketchat-authorization/client/startup.coffee b/packages/rocketchat-authorization/client/startup.coffee
@@ -1,7 +1,7 @@
 RocketChat.authz.subscription = Meteor.subscribe 'permissions'
 
 RocketChat.AdminBox.addOption
-	href: 'rocket-permissions'
+	href: 'admin-permissions'
 	i18nLabel: 'Permissions'
 	permissionGranted: ->
-		return RocketChat.authz.hasAllPermission('access-rocket-permissions')
+		return RocketChat.authz.hasAllPermission('access-permissions')
diff --git a/packages/rocketchat-authorization/client/views/permissions.coffee b/packages/rocketchat-authorization/client/views/permissions.coffee
@@ -11,7 +11,7 @@ Template.permissions.helpers
 			return 'checked' if roles.indexOf(@name) isnt -1
 
 	hasPermission: ->
-		return RocketChat.authz.hasAllPermission 'access-rocket-permissions'
+		return RocketChat.authz.hasAllPermission 'access-permissions'
 
 Template.permissions.events
 	'click .role-permission': (e, instance) ->

diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/packages/rocketchat-authorization/client/views/permissions.html
@@ -2,13 +2,13 @@
 	{{#if hasPermission}}
 		<h1>{{_ "Permissions"}}</h1>
 
-		<a href="{{pathFor "rocket-permissions-new"}}" class="button primary new-role">{{_ "New_role"}}</a>
+		<a href="{{pathFor "admin-permissions-new"}}" class="button primary new-role">{{_ "New_role"}}</a>
 
 		<table border="1">
 			<tr>
 				<td>&nbsp;</td>
 				{{#each role}}
-					<td title="{{description}}"><a href="{{pathFor "rocket-permissions-edit" name=name}}">{{name}}</a></td>
+					<td title="{{description}}"><a href="{{pathFor "admin-permissions-edit" name=name}}">{{name}}</a></td>
 				{{/each}}
 			</tr>
 			{{#each permission}}

diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.coffee b/packages/rocketchat-authorization/client/views/permissionsRole.coffee
@@ -1,5 +1,3 @@
-window.rolee = Roles
-
 Template.permissionsRole.helpers
 	role: ->
 		return Meteor.roles.findOne({ name: FlowRouter.getParam('name') }) or {}
@@ -15,7 +13,7 @@ Template.permissionsRole.helpers
 			return @emails[0].address
 
 	hasPermission: ->
-		return RocketChat.authz.hasAllPermission 'access-rocket-permissions'
+		return RocketChat.authz.hasAllPermission 'access-permissions'
 
 Template.permissionsRole.events
 
@@ -65,7 +63,7 @@ Template.permissionsRole.events
 			toastr.success t('Saved')
 
 			if not @_id?
-				FlowRouter.go 'rocket-permissions-edit', { name: roleData.name }
+				FlowRouter.go 'admin-permissions-edit', { name: roleData.name }
 
 
 	'submit #form-users': (e, instance) ->
@@ -98,7 +96,7 @@ Template.permissionsRole.events
 
 			toastr.success t('Role_removed')
 
-			FlowRouter.go 'rocket-permissions'
+			FlowRouter.go 'admin-permissions'
 
 Template.permissionsRole.onCreated ->
 	# @roles = []

diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.html b/packages/rocketchat-authorization/client/views/permissionsRole.html
@@ -1,6 +1,6 @@
 <template name="permissionsRole">
 	{{#if hasPermission}}
-		<a href="{{pathFor "rocket-permissions"}}">{{_ "Back_to_permissions"}}</a><br><br>
+		<a href="{{pathFor "admin-permissions"}}">{{_ "Back_to_permissions"}}</a><br><br>
 
 		{{#with role}}
 			<form id="form-role" class="inline">

diff --git a/packages/rocketchat-authorization/server/methods/addPermissionToRole.coffee b/packages/rocketchat-authorization/server/methods/addPermissionToRole.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:addPermissionToRole': (permission, role) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log '[methods] authorization:addPermissionToRole -> '.green, 'arguments:', arguments

diff --git a/packages/rocketchat-authorization/server/methods/addUserToRole.coffee b/packages/rocketchat-authorization/server/methods/addUserToRole.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:addUserToRole': (roleName, username) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log('[methods] authorization:addUserToRole -> '.green, 'arguments:', arguments);

diff --git a/packages/rocketchat-authorization/server/methods/deleteRole.coffee b/packages/rocketchat-authorization/server/methods/deleteRole.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:deleteRole': (_id) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log '[methods] authorization:deleteRole -> '.green, 'arguments:', arguments

diff --git a/packages/rocketchat-authorization/server/methods/removeRoleFromPermission.coffee b/packages/rocketchat-authorization/server/methods/removeRoleFromPermission.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:removeRoleFromPermission': (permission, role) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log '[methods] authorization:removeRoleFromPermission -> '.green, 'arguments:', arguments

diff --git a/packages/rocketchat-authorization/server/methods/removeUserFromRole.coffee b/packages/rocketchat-authorization/server/methods/removeUserFromRole.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:removeUserFromRole': (roleName, username) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log('[methods] authorization:removeUserFromRole -> '.green, 'arguments:', arguments);

diff --git a/packages/rocketchat-authorization/server/methods/saveRole.coffee b/packages/rocketchat-authorization/server/methods/saveRole.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	'authorization:saveRole': (_id, roleData) ->
-		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-rocket-permissions'
+		if not Meteor.userId() or not RocketChat.authz.hasPermission Meteor.userId(), 'access-permissions'
 			throw new Meteor.Error "not-authorized"
 
 		console.log '[methods] authorization:saveRole -> '.green, 'arguments:', arguments

diff --git a/packages/rocketchat-authorization/server/publications/roles.coffee b/packages/rocketchat-authorization/server/publications/roles.coffee
@@ -2,7 +2,7 @@ Meteor.publish 'roles', ->
 	unless @userId
 		return @ready()
 
-	if not RocketChat.authz.hasPermission @userId, 'access-rocket-permissions'
+	if not RocketChat.authz.hasPermission @userId, 'access-permissions'
 		throw new Meteor.Error "not-authorized"
 
 	return RocketChat.authz.getRoles()
diff --git a/packages/rocketchat-authorization/server/publications/usersInRole.coffee b/packages/rocketchat-authorization/server/publications/usersInRole.coffee
@@ -2,7 +2,7 @@ Meteor.publish 'usersInRole', (roleName, page = 1) ->
 	unless @userId
 		return @ready()
 
-	if not RocketChat.authz.hasPermission @userId, 'access-rocket-permissions'
+	if not RocketChat.authz.hasPermission @userId, 'access-permissions'
 		throw new Meteor.Error "not-authorized"
 
 	itemsPerPage = 20

diff --git a/packages/rocketchat-authorization/server/startup.coffee b/packages/rocketchat-authorization/server/startup.coffee
@@ -87,7 +87,7 @@ Meteor.startup ->
 		{ _id: 'view-d-room',
 		roles : ['admin', 'site-moderator', 'user']}
 
-		{ _id: 'access-rocket-permissions',
+		{ _id: 'access-permissions',
 		roles : ['admin']}
 	]
 

diff --git a/server/startup/migrations/v24.coffee b/server/startup/migrations/v24.coffee
@@ -0,0 +1,5 @@
+Meteor.startup ->
+	Migrations.add
+		version: 24
+		up: ->
+			RocketChat.models.Permissions.remove({ _id: 'access-rocket-permissions' })