fix(admininistration(js)): improve handling of unauthorized access

Alinto · May 16, 2022 · 1328a25 · 1328a25
1 parent dd07309
commit 1328a25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/UI/WebServerResources/js/Administration/Administration.app.js b/UI/WebServerResources/js/Administration/Administration.app.js
@@ -43,7 +43,8 @@
         },
         resolve: {
           stateUser: stateUser,
-          stateFolder: stateFolder
+          stateFolder: stateFolder,
+          stateAcls: stateAcls
         }
       })
       .state('administration.theme', {
@@ -120,6 +121,11 @@
     return o;
   }
 
+  stateAcls.$inject = ['stateFolder'];
+  function stateAcls(stateFolder) {
+    return stateFolder.$acl.$users(stateFolder.owner);
+  }
+
   /**
    * @ngInject
    */

diff --git a/UI/WebServerResources/js/Administration/AdministrationAclController.js b/UI/WebServerResources/js/Administration/AdministrationAclController.js
@@ -7,12 +7,13 @@
   /**
    * @ngInject
    */
-  AdministrationAclController.$inject = ['$timeout', '$state', '$mdMedia', '$mdToast', 'stateUser', 'stateFolder', 'sgConstant', 'User'];
-  function AdministrationAclController($timeout, $state, $mdMedia, $mdToast, stateUser, stateFolder, sgConstant, User) {
+  AdministrationAclController.$inject = ['$timeout', '$state', '$mdMedia', '$mdToast', 'stateUser', 'stateFolder', 'stateAcls', 'sgConstant', 'User'];
+  function AdministrationAclController($timeout, $state, $mdMedia, $mdToast, stateUser, stateFolder, stateAcls, sgConstant, User) {
     var vm = this;
 
     vm.user = stateUser;
     vm.folder = stateFolder;
+    vm.users = stateAcls;
     vm.folderType = angular.isDefined(stateFolder.$cards)? 'AddressBook' : 'Calendar';
     vm.selectedUser = null;
     vm.selectedUid = null;
@@ -29,9 +30,6 @@
     vm.userFilter = userFilter;
     vm.addUser = addUser;
 
-    stateFolder.$acl.$users(stateFolder.owner).then(function(data) {
-      vm.users = data;
-    });
 
     function getTemplate() {
       if (angular.isDefined(stateFolder.$cards))