fix(api, app): keep old permissions when switch to a new app/api

fix gravitee-io/issues#1535
gravitee-io · Oct 26, 2018 · b4075d2 · b4075d2
1 parent 9d01e24
commit b4075d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/management/api/apis.route.ts b/src/management/api/apis.route.ts
@@ -62,16 +62,14 @@ function apisRouterConfig($stateProvider) {
         resolvedTenants: () => [],
         resolvedApiPermissions: (ApiService, $stateParams) => ApiService.getPermissions($stateParams.apiId),
         onEnter: function (UserService, resolvedApiPermissions) {
-          if (!UserService.currentUser.userApiPermissions) {
-            UserService.currentUser.userApiPermissions = [];
-            _.forEach(_.keys(resolvedApiPermissions.data), function (permission) {
-              _.forEach(resolvedApiPermissions.data[permission], function (right) {
-                let permissionName = 'API-' + permission + '-' + right;
-                UserService.currentUser.userApiPermissions.push(_.toLower(permissionName));
-              });
+          UserService.currentUser.userApiPermissions = [];
+          _.forEach(_.keys(resolvedApiPermissions.data), function (permission) {
+            _.forEach(resolvedApiPermissions.data[permission], function (right) {
+              let permissionName = 'API-' + permission + '-' + right;
+              UserService.currentUser.userApiPermissions.push(_.toLower(permissionName));
             });
-            UserService.reloadPermissions();
-          }
+          });
+          UserService.reloadPermissions();
         }
       }
     })

diff --git a/src/management/application/applications.route.ts b/src/management/application/applications.route.ts
@@ -75,16 +75,14 @@ function applicationsConfig($stateProvider) {
           ApplicationService.get($stateParams.applicationId).then(response => response.data),
         resolvedApplicationPermissions: (ApplicationService, $stateParams) => ApplicationService.getPermissions($stateParams.applicationId),
         onEnter: function (UserService, resolvedApplicationPermissions) {
-          if (!UserService.currentUser.userApplicationPermissions) {
-            UserService.currentUser.userApplicationPermissions = [];
-            _.forEach(_.keys(resolvedApplicationPermissions.data), function (permission) {
-              _.forEach(resolvedApplicationPermissions.data[permission], function (right) {
-                let permissionName = 'APPLICATION-' + permission + '-' + right;
-                UserService.currentUser.userApplicationPermissions.push(_.toLower(permissionName));
-              });
+          UserService.currentUser.userApplicationPermissions = [];
+          _.forEach(_.keys(resolvedApplicationPermissions.data), function (permission) {
+            _.forEach(resolvedApplicationPermissions.data[permission], function (right) {
+              let permissionName = 'APPLICATION-' + permission + '-' + right;
+              UserService.currentUser.userApplicationPermissions.push(_.toLower(permissionName));
             });
-            UserService.reloadPermissions();
-          }
+          });
+          UserService.reloadPermissions();
         }
       }
     })