Merge pull request #4026 from pnrgenc/user-management-fixes

Fix: User permissions & User Management page refresh issue.
Countly · Mar 9, 2023 · aab4ec7 · aab4ec7
2 parents 20404fd + b50dfb4
commit aab4ec7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/api/utils/rights.js b/api/utils/rights.js
@@ -1012,28 +1012,28 @@ exports.hasAdminAccess = function(member, app_id) {
 };
 
 exports.hasCreateRight = function(feature, app_id, member) {
-    var hasAppSpecificRight = (member.permission && member.permission.c && member.permission.c[app_id] && member.permission.c[app_id].allowed[feature]);
+    var hasAppSpecificRight = (member.permission && member.permission.c && member.permission.c[app_id] && member.permission.c[app_id].allowed && member.permission.c[app_id].allowed[feature]);
     var hasGlobalAdminRight = member.global_admin;
     var hasAppAdminRight = member.permission && member.permission.c && member.permission.c[app_id] && member.permission.c[app_id].all;
     return hasAppSpecificRight || hasGlobalAdminRight || hasAppAdminRight;
 };
 
 exports.hasReadRight = function(feature, app_id, member) {
-    var hasAppSpecificRight = (member.permission && member.permission.r && member.permission.r[app_id] && member.permission.r[app_id].allowed[feature]);
+    var hasAppSpecificRight = (member.permission && member.permission.r && member.permission.r[app_id] && member.permission.r[app_id].allowed && member.permission.r[app_id].allowed[feature]);
     var hasGlobalAdminRight = member.global_admin;
     var hasAppAdminRight = member.permission && member.permission.r && member.permission.r[app_id] && member.permission.r[app_id].all;
     return hasAppSpecificRight || hasGlobalAdminRight || hasAppAdminRight;
 };
 
 exports.hasUpdateRight = function(feature, app_id, member) {
-    var hasAppSpecificRight = (member.permission && member.permission.u && member.permission.u[app_id] && member.permission.u[app_id].allowed[feature]);
+    var hasAppSpecificRight = (member.permission && member.permission.u && member.permission.u[app_id] && member.permission.u[app_id].allowed && member.permission.u[app_id].allowed[feature]);
     var hasGlobalAdminRight = member.global_admin;
     var hasAppAdminRight = member.permission && member.permission.u && member.permission.u[app_id] && member.permission.u[app_id].all;
     return hasAppSpecificRight || hasGlobalAdminRight || hasAppAdminRight;
 };
 
 exports.hasDeleteRight = function(feature, app_id, member) {
-    var hasAppSpecificRight = (member.permission && member.permission.d && member.permission.d[app_id] && member.permission.d[app_id].allowed[feature]);
+    var hasAppSpecificRight = (member.permission && member.permission.d && member.permission.d[app_id] && member.permission.d[app_id].allowed && member.permission.d[app_id].allowed[feature]);
     var hasGlobalAdminRight = member.global_admin;
     var hasAppAdminRight = member.permission && member.permission.d && member.permission.d[app_id] && member.permission.d[app_id].all;
     return hasAppSpecificRight || hasGlobalAdminRight || hasAppAdminRight;

diff --git a/frontend/express/public/core/user-management/javascripts/countly.models.js b/frontend/express/public/core/user-management/javascripts/countly.models.js
@@ -47,7 +47,8 @@
             url: countlyCommon.API_PARTS.data.r + '/users/all',
             dataType: "json",
             data: {
-                app_id: countlyCommon.ACTIVE_APP_ID
+                app_id: countlyCommon.ACTIVE_APP_ID,
+                "preventRequestAbort": true
             },
             success: function(json) {
                 _users = json;

diff --git a/frontend/express/public/core/user-management/javascripts/countly.views.js b/frontend/express/public/core/user-management/javascripts/countly.views.js
@@ -117,6 +117,7 @@
             handleCommand: function(command, index) {
                 switch (command) {
                 case "delete-user":
+                    var self = this;
                     CountlyHelpers.confirm(CV.i18n('management-users.this-will-delete-user'), "red", function(result) {
                         if (!result) {
                             CountlyHelpers.notify({
@@ -131,6 +132,7 @@
                                 message: CV.i18n('management-users.removed-message'),
                                 type: 'success'
                             });
+                            self.$emit('refresh-table');
                         });
                     }, [], { image: 'delete-user', title: CV.i18n('management-users.warning') });
                     break;
@@ -773,13 +775,14 @@
         methods: {
             refresh: function() {
                 var self = this;
-                countlyUserManagement.fetchUsers()
-                    .then(function() {
-                        var usersObj = countlyUserManagement.getUsers();
-                        self.users = [];
-                        self.fillOutUsers(usersObj);
-                    })
-                    .catch(function() {});
+                setTimeout(function() {
+                    countlyUserManagement.fetchUsers()
+                        .then(function() {
+                            var usersObj = countlyUserManagement.getUsers();
+                            self.users = [];
+                            self.fillOutUsers(usersObj);
+                        }).catch(function() {});
+                }, 100);
             },
             createUser: function() {
                 this.drawerSettings.editMode = false;