From dc4aeff33ba12a3faea289c15d38b2db9e223cf3 Mon Sep 17 00:00:00 2001
From: Arturs Sosins <ar2rsawseen@gmail.com>
Date: Fri, 4 Mar 2022 21:53:49 +0200
Subject: [PATCH 1/2] [sidebar] permission check

---
 .../countly/vue/components/sidebar.js         | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/frontend/express/public/javascripts/countly/vue/components/sidebar.js b/frontend/express/public/javascripts/countly/vue/components/sidebar.js
index ae50fe59748..e84da7560a4 100644
--- a/frontend/express/public/javascripts/countly/vue/components/sidebar.js
+++ b/frontend/express/public/javascripts/countly/vue/components/sidebar.js
@@ -3,7 +3,7 @@
 (function(countlyVue, $) {
 
     $(document).ready(function() {
-        var _featureMapper = {
+        /*var _featureMapper = {
                 "overview": "core",
                 "analytics": "core",
                 "events": "events",
@@ -63,45 +63,32 @@
                 "overview": ["core"],
                 "analytics": ["core"],
                 "management": ["populator", "config_transfer", "crashes", "blocks", "logger", "compliance_hub"]
-            };
+            };*/
 
         /**
         * Check feature permission before adding sidebar
         * @memberof app
-        * @param {string} code - code text of menu item
+        * @param {string} permission - permission name
         * @returns {boolean} - true if permission granted
         **/
-        var checkMenuPermission = function(code) {
-            if (_menuDependencies[code] && _menuDependencies[code].length) {
-                var granted = false;
-                for (var i = 0; i < _menuDependencies[code].length; i++) {
-                    if (_menuDependencies[code][i] !== "admin" && countlyAuth.validateRead(_menuDependencies[code][i])) {
-                        granted = true;
-                        break;
-                    }
-                    else if (_menuDependencies[code][i] === "admin" && countlyAuth.validateGlobalAdmin()) {
-                        granted = true;
-                        break;
-                    }
-                }
-                return granted;
+        var checkMenuPermission = function(permission) {
+            if (permission) {
+                return countlyAuth.validateRead(permission);
             }
-            return checkSubMenuPermission(code);
+            return countlyAuth.validateGlobalAdmin();
         };
 
         /**
         * Check feature permission before adding sidebar
         * @memberof app
-        * @param {string} code - code text of menu item
+        * @param {string} permission - permission name
         * @returns {boolean} - true if permission granted
         **/
-        var checkSubMenuPermission = function(code) {
-            if (_featureMapper[code] !== "admin") {
-                return countlyAuth.validateRead(_featureMapper[code]);
-            }
-            else {
-                return countlyAuth.validateGlobalAdmin();
+        var checkSubMenuPermission = function(permission) {
+            if (permission) {
+                return countlyAuth.validateRead(permission);
             }
+            return countlyAuth.validateGlobalAdmin();
         };
 
         var AppsMixin = {
@@ -272,7 +259,7 @@
                     }
                     var self = this;
                     var menus = this.menus.reduce(function(acc, val) {
-                        if (val.app_type === self.activeApp.type && checkMenuPermission(val.name)) {
+                        if (val.app_type === self.activeApp.type && checkMenuPermission(val.permission)) {
                             (acc[val.category] = acc[val.category] || []).push(val);
                         }
                         return acc;
@@ -285,7 +272,7 @@
                     }
                     var self = this;
                     var submenus = this.submenus.reduce(function(acc, val) {
-                        if (val.app_type === self.activeApp.type && checkSubMenuPermission(val.name)) {
+                        if (val.app_type === self.activeApp.type && checkSubMenuPermission(val.permission)) {
                             (acc[val.parent_code] = acc[val.parent_code] || []).push(val);
                         }
                         return acc;

From a2edf2fd92c9ef583e86bd43332bb12b73603291 Mon Sep 17 00:00:00 2001
From: Arturs Sosins <ar2rsawseen@gmail.com>
Date: Fri, 4 Mar 2022 22:16:20 +0200
Subject: [PATCH 2/2] [upgrade] disable assistant

---
 bin/upgrade/22.02/upgrade_db.sh | 1 +
 bin/upgrade/22.02/upgrade_fs.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/upgrade/22.02/upgrade_db.sh b/bin/upgrade/22.02/upgrade_db.sh
index 551c7bfb67e..9e8618b3ad8 100644
--- a/bin/upgrade/22.02/upgrade_db.sh
+++ b/bin/upgrade/22.02/upgrade_db.sh
@@ -40,6 +40,7 @@ then
         #disable old plugins
         countly plugin disable EChartMap
         countly plugin disable restrict
+        countly plugin disable assistant
     fi
 
     #run upgrade scripts
diff --git a/bin/upgrade/22.02/upgrade_fs.sh b/bin/upgrade/22.02/upgrade_fs.sh
index 2709fb3b321..6843ca2dfe9 100644
--- a/bin/upgrade/22.02/upgrade_fs.sh
+++ b/bin/upgrade/22.02/upgrade_fs.sh
@@ -56,6 +56,7 @@ then
     #disable old plugins
     countly plugin disable EChartMap
     countly plugin disable restrict
+    countly plugin disable assistant
     
     #get web sdk
     countly update sdk-web