Refactor

meanjs · Jul 24, 2015 · fb71619 · fb71619
1 parent e21805f
commit fb71619
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/modules/articles/client/config/articles.client.routes.js b/modules/articles/client/config/articles.client.routes.js
@@ -18,7 +18,7 @@ angular.module('articles').config(['$stateProvider',
 			url: '/create',
 			templateUrl: 'modules/articles/views/create-article.client.view.html',
 			data: {
-				forbiddenRoles: ['guest']
+				roles: ['admin']
 			}
 		}).
 		state('articles.view', {
@@ -29,7 +29,7 @@ angular.module('articles').config(['$stateProvider',
 			url: '/:articleId/edit',
 			templateUrl: 'modules/articles/views/edit-article.client.view.html',
 			data: {
-				forbiddenRoles: ['guest']
+				roles: ['user']
 			}
 		});
 	}

diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js
@@ -13,9 +13,15 @@ angular.module(ApplicationConfiguration.applicationModuleName).config(['$locatio
 angular.module(ApplicationConfiguration.applicationModuleName).run(function($rootScope, $state, Authentication) {
     // Check authentication before changing state
     $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
-        if (toState.data && toState.data.forbiddenRoles) {
-            // If access of guest user is forbidden:
-            if (toState.data.forbiddenRoles.indexOf('guest') !== -1 && Authentication.user === '') {
+        if (toState.data && toState.data.roles && toState.data.roles.length > 0) {
+            var allowed = false;
+            toState.data.roles.forEach(function (role) {
+               if (Authentication.user.roles.indexOf(role) !== -1) {
+                   allowed = true;
+               }
+            });
+
+            if (!allowed) {
                 event.preventDefault();
                 $state.go('authentication.signin', {}, {
                     notify: false