1.刪除鑰匙

2.user list 關閉the one disable和admin 被關閉功能

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

@@ -1225,15 +1225,27 @@ namespace backstage.Controllers
         public async Task<ResultModel> AdminAddAjax(int uid, int isAdmin)
         {
             var result = new ResultModel();
+            string msg;
+            if (uid == 1)
+            {
 
-            //// 確認使用者是否已經登入
-            //if (!User.Identity.IsAuthenticated)
-            //{
-            //    result.IsSuccess = false;
-            //    result.Message = "未登入";
-            //    return result;
-            //}
+                switch (_currentLanguage)
+                {
 
+                    case "en":
+                        msg = "This user can't be remove from admin permission.";
+                        break;
+                    case "zh":
+                        msg = "此帳號不得移除Admin";
+                        break;
+                    default:
+                        msg = "此帳號不得移除Admin";
+                        break;
+                }
+                result.IsSuccess = false;
+                result.Message = msg;
+                return result;
+            }
             // 取得使用者的 "token" Claim 值
             string token = User.FindFirstValue("token");
 
@@ -1377,7 +1389,27 @@ namespace backstage.Controllers
 
             // 取得使用者的 "token" Claim 值
             string token = User.FindFirstValue("token");
+            string msg;
+            if (uid == 1)
+            {
+
+                switch (_currentLanguage)
+                {
 
+                    case "en":
+                        msg = "This user can't be disable.";
+                        break;
+                    case "zh":
+                        msg = "此帳號不得disable";
+                        break;
+                    default:
+                        msg = "此帳號不得disable";
+                        break;
+                }
+                result.IsSuccess = false;
+                result.Message = msg;
+                return result;
+            }
             #region user/list
             var url = _config["IP"] + "/user/list";
             var httpMethod = HttpMethod.Post;

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

@@ -96,7 +96,7 @@
 
 													<a data-toggle="modal" data-target="#deleteProject" title="Delete">
 
-														<a class="deleteKeyBtn" data-keyId="@k.id" data-toggle="modal" data-target="#deleteProject" title="Delete">
+														<a class="deleteKeyBtn" data-keyid="@k.id" data-toggle="modal" data-target="#deleteProject" title="Delete">
 
 															<i class="fa-solid fa-trash-can"></i>
 														</a>
@@ -285,7 +285,7 @@
 							</p>
 
 							<div class="SubmitBlock SubmitBlock_sm">
-								<button id="confirmBtn" type="submit" class="btn btn-mainblue-solid" style="margin-right: 10px; width: 80px">@Localizer["Confirm"]</button>
+								<button id="confirmBtn" class="btn btn-mainblue-solid" style="margin-right: 10px; width: 80px">@Localizer["Confirm"]</button>
 								<button type="button" class="btn btn-mainblue-hollow" data-dismiss="modal" style="margin-right: 10px; width: 80px">@Localizer["Cancel"]</button>
 							</div>
 
@@ -323,6 +323,7 @@
 
 			var selectKeyId;
 
+
 			$('.deleteKeyBtn').click(function (e) {
 
 				selectKeyId = parseInt( $(this).data('keyid'));
@@ -332,7 +333,7 @@
 
 			//刪除鑰匙
 			$("#confirmBtn").on("click", function (e) {
-
+				e.preventDefault(); // 防止點擊後刷新頁面（如果該鏈接是 <a> 標籤）
 				var data = {
 					keyId: selectKeyId
 				};
@@ -346,8 +347,9 @@
 						// API 呼叫成功的處理程式碼
 
 						showAlert(response.isSuccess, response.message)
+						console.log(response);
 						if (response.isSuccess) {
-
+							$('#deleteProject').modal('hide');
 							setTimeout(function () {
 								location.reload();
 							}, 2000);

Merchant Token Vault Management/backstage/Views/User/ListUsers.cshtml

@@ -70,9 +70,30 @@
 
 												@*<td>@i.locked</td>*@
 											<td>@i.creation_date</td>
-											<td>            <input type="checkbox" data-uid="@i.uid" class="toggleButton isEnable" @(i.enabled == 1 ? "checked" : "")></td>
+											<td>
+												@if (i.uid == 1)
+												{
+													<input type="checkbox" data-uid="@i.uid" class="toggleButton isEnable" @(i.enabled == 1 ? "checked" : "") disabled>
+												}
+												else
+												{
+													<input type="checkbox" data-uid="@i.uid" class="toggleButton isEnable" @(i.enabled == 1 ? "checked" : "")>
+												}
+
+											</td>
+
+											<td>
+												@if (i.uid == 1)
+												{
+												<input type="checkbox" data-uid="@i.uid" class="toggleButton isAdmin" @(i.isAdmin ? "checked" : "") disabled>
+												}
+												else
+												{
+											<input type="checkbox" data-uid="@i.uid" class="toggleButton isAdmin" @(i.isAdmin ? "checked" : "")>
+												}
 
-											<td>            <input type="checkbox" data-uid="@i.uid" class="toggleButton isAdmin" @(i.isAdmin ? "checked" : "")></td>
+												
+											</td>
 											@*@if (i.isAdmin)
 												{ <td>是</td>}
 												else { <td></td>}*@