1.fix 權限登入問題

2.修改密碼邏輯

Merchant Token Vault Management/backstage/Controllers/KeyController.cs

@@ -173,12 +173,15 @@ namespace backstage.Controllers
                             {
                                 // 下載圖檔位元組數據
                                 byte[] imageBytes = await client.GetByteArrayAsync(imageUrl);
-
+                                System.IO.File.Delete(imagePath);
                                 // 將圖檔寫入目標路徑
                                 System.IO.File.WriteAllBytes(imagePath, imageBytes);
                                 // 添加下載路徑到集合中
-                                string downloadPath = Path.Combine("/images", fileName);
-                                downloadPaths.Add(downloadPath);
+                                if (System.IO.File.Exists(imagePath))
+                                {
+                                    string downloadPath = Path.Combine("/images", fileName);
+                                    downloadPaths.Add(downloadPath);
+                                }
                             }
                         }
 
@@ -216,7 +219,7 @@ namespace backstage.Controllers
                                     }
                                     result.IsSuccess = true;
                                     result.Message = msg;
-                                
+
                                     return result;
                                 }
                                 else

Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs

@@ -628,20 +628,20 @@ namespace backstage.Controllers
         /// <returns></returns>
         [Authorize(Policy = "AdminOnly")]
         [HttpPost]
-        public async Task<ResultModel> AddUsers([FromBody] JsonElement requestData)
+        public async Task<ResultModel> AddUsers([FromBody] IFormCollection form)
         {
             string msg;
             var result = new ResultModel();
-            int Merchant_id = requestData.GetProperty("Merchant_id").GetInt32();
-            int vault_id = requestData.GetProperty("vault_id").GetInt32();
-            int field_id = requestData.GetProperty("field_id").GetInt32();
-            int user_id = requestData.GetProperty("user_id").GetInt32();
+            int merchant_id = Convert.ToInt32( form["merchant_id"]);
+            int vault_id = Convert.ToInt32(form["vault_id"]);
+            int field_id = Convert.ToInt32(form["field_id"]);
+            int user_id = Convert.ToInt32(form["id"]);
 
 
 
             // 構建包含參數的查詢字串
             var queryString = new RouteValueDictionary {
-                { "Merchant_id", Merchant_id },
+                { "Merchant_id", merchant_id },
                 { "vault_id", vault_id },
                 { "field_id", field_id },
             };
@@ -749,7 +749,7 @@ namespace backstage.Controllers
                 var DepartmentsResponse = JsonConvert.DeserializeObject<DepartmentsResponse>(apiResult.Data.ToString());
                 if (DepartmentsResponse.count > 0)
                 {
-                    var existDepartment = DepartmentsResponse.merchants.Where(m => m.merchant_id == Merchant_id).FirstOrDefault();
+                    var existDepartment = DepartmentsResponse.merchants.Where(m => m.merchant_id == merchant_id).FirstOrDefault();
                     if (existDepartment == null)
                     {
                         switch (_currentLanguage)
@@ -820,7 +820,7 @@ namespace backstage.Controllers
             httpMethod = HttpMethod.Post;
             parameters = new Dictionary<string, string>
                       {
-                            { "Merchant_id", Merchant_id.ToString() },
+                            { "Merchant_id", merchant_id.ToString() },
                             { "id", vault_id.ToString() },
                             { "info", "FIELDS" },
 
@@ -904,7 +904,7 @@ namespace backstage.Controllers
              {
                 new {
                     userId = user_id.ToString(),
-                    merchantId = Merchant_id.ToString()
+                    merchantId = merchant_id.ToString()
                 }
             };
             parameters = new Dictionary<string, string>
@@ -949,7 +949,7 @@ namespace backstage.Controllers
                     { "token", token},
                     { "vault_id", vault_id.ToString()},
                     { "access_code", "31"},
-                    { "merchant_id", Merchant_id.ToString()},
+                    { "merchant_id", merchant_id.ToString()},
                     { "user_id", user_id.ToString()},
                 };
 
@@ -999,7 +999,7 @@ namespace backstage.Controllers
 
                     { "id", vault_id.ToString()},
                     { "info", "USERS"},
-                    { "Merchant_id", Merchant_id.ToString()},
+                    { "Merchant_id", merchant_id.ToString()},
                     { "data", JsonConvert.SerializeObject(addUserToField_data)},
                 };
 

Merchant Token Vault Management/backstage/Models/Users/User.cs

@@ -34,6 +34,7 @@ namespace backstage.Models.Users
         public string lang { get; set; } = "zhg";
         //判斷是否為admin
         public bool isAdmin { get; set; } = false;
+        public int[] admin_rold_id { get; set; } = new int [1];//最高權限
 
         //=========Fields=========
         public List<int> masks{get;set;}

Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml

@@ -399,6 +399,8 @@
 			document.getElementById("recoverKeyForm").classList.remove("show");
 			// 页面加载完成后，隐藏 maskSettingsAdvID
 
+		
+
 
 			//刪除鑰匙
 			$("#confirmBtn").on("click", function (e) {
@@ -455,7 +457,8 @@
 							$('#image2').attr('src', imageUrls[1]);
 							$('#downloadBtn1').attr('href', imageUrls[0]);
 							$('#downloadBtn2').attr('href', imageUrls[1]);
-							$('#imageModal').modal();
+							$('#imageModal').modal({ backdrop: 'static', keyboard: false });
+							
 							//setTimeout(function () {
 							//	location.reload();
 							//}, 2000);

Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml

@@ -79,12 +79,12 @@
 							<a class="dropdown-item" asp-controller="User" asp-action="ChangePassword" asp-route-username="@Context.User.Claims.FirstOrDefault(m => m.Type == "username").Value" asp-route-returnUrl="@Context.Request.Path.Value">
 								<i class="mdi mdi-lock-open mr-2"></i>@Localizer["Change Password"]
 							</a>
-							<a class="dropdown-item" asp-controller="User" asp-action="Register">
+							@*<a class="dropdown-item" asp-controller="User" asp-action="Register">
 								<i class="mdi mdi-account-plus mr-2"></i>@Localizer["Setting Backup"]
 							</a>
 							<a class="dropdown-item" asp-controller="" asp-action="">
 								<i class="mdi mdi-account-details mr-2"></i>@Localizer["Vault Backup"]
-							</a>
+							</a>*@
 
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" asp-controller="User" asp-action="Logout">