refactor: Code cleanup

Author: masterspambot

src/authorization/Authorization.js

@@ -25,20 +25,50 @@
          * @returns {promise} $q.promise object
          */
         function authorize(permissionsMap, toParams) {
+
+          if (isCompensatedMap(permissionsMap)) {
+            return authorizeCompensatedMap(permissionsMap, toParams);
+          }
+
+          return authorizeDecompensatedMap(permissionsMap, toParams);
+        }
+
+        /**
+         * Checks if provided map is compensated or not
+         *
+         * @param permissionMap {Object} Map of permission names
+         * @returns {boolean}
+         */
+        function isCompensatedMap(permissionMap) {
+          return !!((angular.isArray(permissionMap.only[0])) || angular.isArray(permissionMap.except[0]));
+        }
+
+
+        /**
+         * Checks authorization for complex state inheritance
+         * @method
+         * @private
+         *
+         * @param permissionMap {Object} Map of permission names
+         * @param [toParams] {Object} UI-Router params object
+         *
+         * @returns {promise} $q.promise object
+         */
+        function authorizeCompensatedMap(permissionMap, toParams) {
           var deferred = $q.defer();
 
-          var exceptPromises = resolveAccessRights(permissionsMap.except, toParams);
+          var exceptPromises = resolveAccessRights(permissionMap.except, toParams);
 
           $q.all(exceptPromises)
             .then(function (rejectedPermissions) {
               deferred.reject(rejectedPermissions);
             })
             .catch(function () {
-              if (!permissionsMap.only.length) {
+              if (!permissionMap.only.length) {
                 deferred.resolve(null);
               }
 
-              var onlyPromises = resolveAccessRights(permissionsMap.only, toParams);
+              var onlyPromises = resolveAccessRights(permissionMap.only, toParams);
 
               $q.all(onlyPromises)
                 .then(function (resolvedPermissions) {
@@ -52,6 +82,43 @@
           return deferred.promise;
         }
 
+        /**
+         * Checks authorization for simple view based access
+         * @method
+         * @private
+         *
+         * @param permissionMap {Object} Map of permission names
+         * @param [toParams] {Object} UI-Router params object
+         *
+         * @returns {promise} $q.promise object
+         */
+        function authorizeDecompensatedMap(permissionMap, toParams) {
+          var deferred = $q.defer();
+          var exceptPromises = resolveStateAccessRights(permissionMap.except, toParams);
+
+          only(exceptPromises)
+            .then(function (rejectedPermissions) {
+              deferred.reject(rejectedPermissions);
+            })
+            .catch(function () {
+              if (!permissionMap.only.length) {
+                deferred.resolve(null);
+              }
+
+              var onlyPromises = resolveStateAccessRights(permissionMap.only, toParams);
+
+              only(onlyPromises)
+                .then(function (resolvedPermissions) {
+                  deferred.resolve(resolvedPermissions);
+                })
+                .catch(function (rejectedPermission) {
+                  deferred.reject(rejectedPermission);
+                });
+            });
+
+          return deferred.promise;
+        }
+
         /**
          * Performs iteration over list of defined access rights looking for matches
          * @method
@@ -63,7 +130,7 @@
          * @returns {Array} Promise collection
          */
         function resolveAccessRights(accessRightSet, toParams) {
-          if (accessRightSet.length === 0) {
+          if (!accessRightSet.length) {
             return [$q.reject()];
           }
 
@@ -83,6 +150,10 @@
          * @returns {Array}
          */
         function resolveStateAccessRights(stateAccessRights, toParams) {
+          if (stateAccessRights.length === 0) {
+            return [];
+          }
+
           return stateAccessRights.map(function (accessRightName) {
             if (RoleStore.hasRoleDefinition(accessRightName)) {
               var role = RoleStore.getRoleDefinition(accessRightName);

src/core/permissionModule.js

@@ -89,7 +89,7 @@
        * @method
        * @private
        *
-       * @returns {PermissionMapFactory} Permission map
+       * @returns {permission.PermissionMap} Permission map
        */
       function compensatePermissionMap() {
         var permissionMap = new PermissionMap();
@@ -118,7 +118,7 @@
        * @method
        * @private
        *
-       * @param permissionMap {PermissionMapFactory} Map of permission names
+       * @param permissionMap {permission.PermissionMap} Map of permission names
        */
       function authorizeForState(permissionMap) {
         Authorization
@@ -127,7 +127,7 @@
             handleAuthorizedState();
           })
           .catch(function (rejectedPermission) {
-            return handleUnauthorizedState(permissionMap, rejectedPermission);
+            handleUnauthorizedState(permissionMap, rejectedPermission);
           })
           .finally(function () {
             setStateAuthorizationStatus(false);
@@ -156,14 +156,13 @@
        * @method
        * @private
        *
-       * @param permissionMap {PermissionMapFactory} Map of access rights names
+       * @param permissionMap {permission.PermissionMap} Map of access rights names
        * @param rejectedPermission {String} Rejected access right
-       * @returns {*}
        */
       function handleUnauthorizedState(permissionMap, rejectedPermission) {
         $rootScope.$broadcast('$stateChangePermissionDenied', toState, toParams, options);
 
-        return permissionMap
+        permissionMap
           .resolveRedirectState(rejectedPermission)
           .then(function (redirect) {
             $state.go(redirect.state, redirect.params, redirect.options);

src/models/PermissionMap.js

@@ -44,8 +44,12 @@
          * @param permissionMap {permission.PermissionMap} Compensated permission map
          */
         PermissionMap.prototype.extendPermissionMap = function (permissionMap) {
-          this.only = this.only.concat(permissionMap.only);
-          this.except = this.except.concat(permissionMap.except);
+          if (permissionMap.only.length) {
+            this.only = this.only.concat([permissionMap.only]);
+          }
+          if (permissionMap.except.length) {
+            this.except = this.except.concat([permissionMap.except]);
+          }
         };
 
         /**
@@ -151,20 +155,15 @@
          */
         function resolvePermissionMapProperty(property, toState, toParams, options) {
           if (angular.isString(property)) {
-            return [[property]];
+            return [property];
           }
 
           if (angular.isArray(property)) {
-            // @todo: Naive checking if provided array is already compensated one
-            if (angular.isArray(property[0])) {
-              return property;
-            }
-
-            return [property];
+            return property;
           }
 
           if (angular.isFunction(property)) {
-            return [property.call(null, toState, toParams, options)];
+            return property.call(null, toState, toParams, options);
           }
 
           return [];