From 5569a72e680d3d806611673a24128df9ac635a60 Mon Sep 17 00:00:00 2001
From: Mohd Ariff <catalyx_x@yahoo.com>
Date: Fri, 22 Nov 2024 10:10:54 +0800
Subject: [PATCH] Update

---
 Controllers/AdminController.cs   |  2 +-
 CustomPolicy/RoleModulePolicy.cs | 12 +++++++++---
 Views/Admin/ModuleSetting.cshtml |  5 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Controllers/AdminController.cs b/Controllers/AdminController.cs
index ad2d267..646bcc5 100644
--- a/Controllers/AdminController.cs
+++ b/Controllers/AdminController.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 
 namespace PSTW_CentralSystem.Controllers
 {
-    [Authorize(Policy = "RoleModulePolicy")]
+    //[Authorize(Policy = "RoleModulePolicy")]
     public class AdminController : Controller
     {
         private readonly AuthDBContext _authDbContext;
diff --git a/CustomPolicy/RoleModulePolicy.cs b/CustomPolicy/RoleModulePolicy.cs
index 29f3e41..bd0cb1e 100644
--- a/CustomPolicy/RoleModulePolicy.cs
+++ b/CustomPolicy/RoleModulePolicy.cs
@@ -64,7 +64,13 @@ namespace PSTW_CentralSystem.CustomPolicy
 
             void checkModuleExistOrNot()
             {
-                if (registeredModule == null)
+
+                if ( moduleName == "Admin")
+                {
+                    context.Fail();
+                    return;
+                }
+                else if (registeredModule == null)
                 {
                     context.Fail();
                     return;
@@ -105,13 +111,13 @@ namespace PSTW_CentralSystem.CustomPolicy
 
             void checkMethodAndRole()
             {
+
                 // Load all ModuleSettings and process them in memory
                 var moduleSettings = _authDBContext.ModuleSettings.AsEnumerable();
 
                 // Check if the method exists in the module settings
                 // Check if the method exists in the module settings
-                var isMethodExist = moduleSettings
-                    .FirstOrDefault(m => m.MethodAllowedUserType?.Any(mt => mt.MethodName == pageName) == true);
+                var isMethodExist = moduleSettings.FirstOrDefault(m => m.MethodAllowedUserType?.Any(mt => mt.MethodName == pageName) == true);
 
 
                 if (isMethodExist != null) // Check if the method exists which means method is registered
diff --git a/Views/Admin/ModuleSetting.cshtml b/Views/Admin/ModuleSetting.cshtml
index 5f5ae4f..e0daeb7 100644
--- a/Views/Admin/ModuleSetting.cshtml
+++ b/Views/Admin/ModuleSetting.cshtml
@@ -46,7 +46,7 @@
                                                 </select>
                                             </div>
                                             <button class="btn col-md-3 f-icon mt-3 d-flex align-items-center" style="height: 36px; width: auto">
-                                                <i class=" fas fa-plus-square fa-lg"></i>&nbsp;Add method
+                                                <i class=" fas fa-plus-square fa-lg"></i>&ensp;Add method
                                             </button>
                                         </div>
                                         <div class="form-group row">
@@ -71,8 +71,7 @@
                                                     <div class="form-group row">
                                                         <label class="col-md-1">Role:</label>
                                                         <div class="col-md-6">
-                                                            <select class="select2 form-select shadow-none mt-3" multiple="multiple" style="height: 36px; width: 100%" v-model="moduleData.methodAllowedUserType[index].allowedUserTypesArray
-">
+                                                            <select class="select2 form-select shadow-none mt-3" multiple="multiple" style="height: 36px; width: 100%" v-model="moduleData.methodAllowedUserType[index].allowedUserTypesArray">
                                                                 <option v-for="(roleType, index) in roleData" :key="index" :value="roleType.name">{{ roleType.name }}</option>
                                                             </select>
                                                         </div>