From 44c9ef9166f64730cadd8ddf0a8921b7ecdcd4b9 Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sun, 20 Oct 2019 17:57:31 +0800
Subject: [PATCH 1/4] Complete some permission checks.

---
 .../Pages/Identity/Roles/Index.cshtml                     | 7 ++++++-
 .../Pages/TenantManagement/Tenants/Index.cshtml           | 7 ++++++-
 .../Pages/ProductManagement/Products/index.js             | 8 ++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
index d2758f05d4..6d2721079f 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
@@ -1,4 +1,5 @@
 @page
+@using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.Identity.Localization
@@ -6,6 +7,7 @@
 @using Volo.Abp.Identity.Web.Pages.Identity.Roles
 @model IndexModel
 @inject IHtmlLocalizer<IdentityResource> L
+@inject IAuthorizationService Authorization
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Roles"].Value;
@@ -30,7 +32,10 @@
                 <abp-card-title>@L["Roles"]</abp-card-title>
             </abp-column>
             <abp-column size-md="_6" class="text-right">
-                <abp-button button-type="Primary" name="CreateRole" text="@L["NewRole"].Value" icon="plus" />
+                @if (await Authorization.IsGrantedAsync(IdentityPermissions.Roles.Create))
+                {
+                    <abp-button button-type="Primary" name="CreateRole" text="@L["NewRole"].Value" icon="plus" />
+                }
             </abp-column>
         </abp-row>
     </abp-card-header>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
index b5db7642ba..d41f1c7b53 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
@@ -1,4 +1,5 @@
 @page
+@using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.TenantManagement.Localization
@@ -6,6 +7,7 @@
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 @model IndexModel
 @inject IHtmlLocalizer<AbpTenantManagementResource> L
+@inject IAuthorizationService Authorization
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Tenants"].Value;
@@ -26,7 +28,10 @@
                 <abp-card-title>@L["Tenants"]</abp-card-title>
             </abp-column>
             <abp-column size-md="_6" class="text-right">
-                <abp-button button-type="Primary" name="CreateTenant" icon="plus" text="@L["NewTenant"].Value" />
+                @if (await Authorization.IsGrantedAsync(TenantManagementPermissions.Tenants.Create))
+                {
+                    <abp-button button-type="Primary" name="CreateTenant" icon="plus" text="@L["NewTenant"].Value" />
+                }
             </abp-column>
         </abp-row>
     </abp-card-header>
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/Pages/ProductManagement/Products/index.js b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/Pages/ProductManagement/Products/index.js
index 2359310a5e..78fec06ba9 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/Pages/ProductManagement/Products/index.js
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/Pages/ProductManagement/Products/index.js
@@ -20,9 +20,7 @@
                         [
                             {
                                 text: l('Edit'),
-                                visible: function () {
-                                    return true; //TODO: Check permission
-                                },
+                                visible: abp.auth.isGranted('ProductManagement.Product.Update'),
                                 action: function (data) {
                                     _editModal.open({
                                         productId: data.record.id
@@ -31,9 +29,7 @@
                             },
                             {
                                 text: l('Delete'),
-                                visible: function () {
-                                    return true; //TODO: Check permission
-                                },
+                                visible: abp.auth.isGranted('ProductManagement.Product.Delete'),
                                 confirmMessage: function (data) { return l('ProductDeletionWarningMessage'); },
                                 action: function (data) {
                                     productManagement.products

From 5538cd9fd40ca096c5db0941436ed5e0c6f1d953 Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sun, 20 Oct 2019 18:38:47 +0800
Subject: [PATCH 2/4] Complete some permission checks for Angular UI.

---
 .../lib/components/roles/roles.component.html | 27 ++++++++++++++++---
 .../lib/components/users/users.component.html | 20 +++++++++++---
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index 822c5a9576..05729fb5c4 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -4,7 +4,13 @@
   </div>
   <div class="col">
     <div class="text-lg-right pt-2" id="AbpContentToolbar">
-      <button id="create-role" class="btn btn-primary" type="button" (click)="onAdd()">
+      <button
+        [abpPermission]="'AbpIdentity.Roles.Create'"
+        id="create-role"
+        class="btn btn-primary"
+        type="button"
+        (click)="onAdd()"
+      >
         <i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewRole' | abpLocalization }}</span>
       </button>
     </div>
@@ -76,11 +82,24 @@
                 <i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }}
               </button>
               <div ngbDropdownMenu>
-                <button ngbDropdownItem (click)="onEdit(data.id)">{{ 'AbpIdentity::Edit' | abpLocalization }}</button>
-                <button ngbDropdownItem (click)="providerKey = data.name; visiblePermissions = true">
+                <button
+                  [abpPermission]="'AbpIdentity.Roles.Update'"
+                  ngbDropdownItem
+                  (click)="onEdit(data.id)"
+                >
+                  {{ 'AbpIdentity::Edit' | abpLocalization }}
+                </button>
+                <button
+                  [abpPermission]="'AbpIdentity.Roles.ManagePermissions'"
+                  ngbDropdownItem
+                  (click)="providerKey = data.name; visiblePermissions = true"
+                >
                   {{ 'AbpIdentity::Permissions' | abpLocalization }}
                 </button>
-                <button ngbDropdownItem (click)="delete(data.id, data.name)">
+                <button
+                  [abpPermission]="'AbpIdentity.Roles.Delete'"
+                  ngbDropdownItem (click)="delete(data.id, data.name)"
+                >
                   {{ 'AbpIdentity::Delete' | abpLocalization }}
                 </button>
               </div>
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index af1381e000..6041a1a880 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -87,11 +87,25 @@
                 <i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }}
               </button>
               <div ngbDropdownMenu>
-                <button ngbDropdownItem (click)="onEdit(data.id)">{{ 'AbpIdentity::Edit' | abpLocalization }}</button>
-                <button ngbDropdownItem (click)="providerKey = data.id; visiblePermissions = true">
+                <button
+                  [abpPermission]="'AbpIdentity.Users.Update'"
+                  ngbDropdownItem
+                  (click)="onEdit(data.id)"
+                >
+                  {{ 'AbpIdentity::Edit' | abpLocalization }}
+                </button>
+                <button
+                  [abpPermission]="'AbpIdentity.Users.ManagePermissions'"
+                  ngbDropdownItem
+                  (click)="providerKey = data.id; visiblePermissions = true"
+                >
                   {{ 'AbpIdentity::Permissions' | abpLocalization }}
                 </button>
-                <button ngbDropdownItem (click)="delete(data.id, data.userName)">
+                <button
+                  [abpPermission]="'AbpIdentity.Users.Delete'"
+                  ngbDropdownItem
+                  (click)="delete(data.id, data.userName)"
+                >
                   {{ 'AbpIdentity::Delete' | abpLocalization }}
                 </button>
               </div>

From 134a8455cfc3023a724c82d5e7e2313877135296 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 21 Oct 2019 10:47:39 +0300
Subject: [PATCH 3/4] added missing namespace

---
 .../src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
index 6d2721079f..4658f44013 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
@@ -2,6 +2,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.Identity
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.Identity.Web.Navigation
 @using Volo.Abp.Identity.Web.Pages.Identity.Roles

From 07156bc164bf9066d9bb0256df9500ac1fd22e84 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 21 Oct 2019 10:51:31 +0300
Subject: [PATCH 4/4] added missing namespace

---
 .../Pages/TenantManagement/Tenants/Index.cshtml                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
index d41f1c7b53..22e17f7c86 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
@@ -2,6 +2,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.TenantManagement
 @using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.TenantManagement.Web.Navigation
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants