From 41d2856e3921dd94d3c5d8d6ad8c1c1bc8450e62 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 8 Sep 2016 18:43:25 +0530
Subject: [PATCH] Enable permission check according to the new permissions

---
 .../pages/mdm.page.dashboard/dashboard.hbs    |  4 ---
 .../app/pages/mdm.page.dashboard/dashboard.js | 12 ++++++---
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.hbs  | 20 ++++----------
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.js   | 27 ++++++++++---------
 4 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
index f5b969973..0bf54e2c2 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
@@ -19,7 +19,6 @@
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "mdm.unit.device.qr-modal"}}
 {{#zone "content"}}
-    {{#if permissions.VIEW_DASHBOARD}}
         {{#if permissions.LIST_DEVICES}}
             <div class="row ">
                 <div class="col-md-3 wr-stats-board">
@@ -151,9 +150,6 @@
                 </div>
             </div>
         {{/if}}
-    {{else}}
-        Permission denied
-    {{/if}}
 {{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/dashboard.js"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
index e9b07a654..a6c495532 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
@@ -20,10 +20,16 @@ function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var generalConfig = context.app.conf["generalConfig"];
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
-
     var viewModel = {};
-    viewModel.permissions = userModule.getUIPermissions();
-    new Log().debug("## Permissions : " + stringify(userModule.getUIPermissions()));
+    var permissions = {};
+    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
+    permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
+    permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
+    permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
+    permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
+    viewModel.permissions = permissions;
     //TODO: Move enrollment URL into app-conf.json
     viewModel.enrollmentURL = mdmProps.generalConfig.host +  mdmProps.enrollmentDir;
     return viewModel;
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
index 18afc371a..9d24059a2 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -22,30 +22,20 @@
 {{/zone}}
 
 {{#zone "navMenu-items"}}
-    {{#if permissions.VIEW_DASHBOARD}}
         <li>
             <a href="{{@app.context}}">
                 <i class="fw fw-dashboard"></i>
                 Admin Dashboard
             </a>
         </li>
-    {{/if}}
-    {{#if permissions.LIST_DEVICES_ADMIN}}
+
+    {{#if permissions.LIST_DEVICES}}
         <li>
             <a href="{{@app.context}}/devices">
                 <i class="fw fw-mobile"></i>
                 Device Management
             </a>
         </li>
-    {{else}}
-        {{#if permissions.LIST_OWN_DEVICES}}
-            <li>
-                <a href="{{@app.context}}/devices">
-                    <i class="fw fw-mobile"></i>
-                    Device Management
-                </a>
-            </li>
-        {{/if}}
     {{/if}}
 
     <li><a><i class="fw fw-user"></i>User Management</a>
@@ -64,12 +54,12 @@
     {{/if}}
     <li><a><i class="fw fw-settings"></i>Configuration Management</a>
         <ul>
-            {{#if permissions.TENANT_CONFIGURATION}}
+            {{#if permissions.LIST_CONFIGURATION}}
                 <li><a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>Platform Configurations</a>
                 </li>
             {{/if}}
             <!-- todo change the permission and get the related permission -->
-            {{#if permissions.TENANT_CONFIGURATION}}
+            {{#if permissions.LIST_CONFIGURATION}}
                 <li><a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>Certificate Configurations</a>
                 </li>
             {{/if}}
@@ -93,7 +83,7 @@
     </ul>
 {{/zone}}
 {{#zone "sidePanes"}}
-    <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{isAuthorizedForNotifications}}"
+    <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{permissions.LIST_NOTIFICATIONS}}"
          data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="50" data-spy="affix"
          data-offset-top="80">
         <ul class="sidebar-messages">
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
index 363d9688e..320e0394d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
@@ -30,27 +30,30 @@ function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-    var uiPermissions = userModule.getUIPermissions();
-    context["permissions"] = uiPermissions;
-
     var links = {
         "user-mgt": [],
         "role-mgt": [],
         "policy-mgt": [],
         "device-mgt": []
     };
+    var viewModel = {};
 
-    // following context.link value comes here based on the value passed at the point
+    // following viewModel.link value comes here based on the value passed at the point
     // where units are attached to a page zone.
     // eg: {{unit "appbar" pageLink="users" title="User Management"}}
-    context["currentActions"] = links[context["pageLink"]];
-    context["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
-    var  isAuthorizedForNotifications =
-        userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/notifications/view");
+    viewModel["currentActions"] = links[viewModel["pageLink"]];
+    viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
     var currentUser = session.get(constants["USER_SESSION_KEY"]);
-    context["isAuthorizedForNotifications"] = isAuthorizedForNotifications;
-    context["currentUser"] = currentUser;
-    context["appContext"] = mdmProps["appContext"];
+    var permissions = {};
+    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
+    permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
+    permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    permissions.LIST_NOTIFICATIONS = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
+    permissions.LIST_CONFIGURATION = userModule.isAuthorized("/permission/admin/device-mgt/configurations/view");
+    viewModel.permissions = permissions;
+    viewModel["currentUser"] = currentUser;
+    viewModel["appContext"] = mdmProps["appContext"];
 
-    return context;
+    return viewModel;
 }
\ No newline at end of file