v2.32

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

@@ -133,80 +133,34 @@ namespace backstage.Controllers
                 result.Message = msg;
                 return result;
             }
-			#endregion
-
-			#region name重複檢查
-			var url = _config["IP"] + "/security/key/list";
-			var httpMethod = HttpMethod.Post;
-			var parameters = new Dictionary<string, string>
-			{
+            #endregion
 
-			};
-			var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
-            if (apiResult.IsSuccess)
+            #region name重複檢查
+            result = await CheckNameRepeat(key_name);
+            if (!result.IsSuccess)
             {
-                try
-                {
-					var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
-                    if (response.r == 0)
-                    {
-                        var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
-                        var keyNameRepeat = keylist.Where(x => x.name == key_name).FirstOrDefault();
-                        if (keyNameRepeat != null)
-                        {
-                            result.IsSuccess = false;
-                            switch (_currentLanguage)
-                            {
-                                case "en":
-                                    msg = "key name already exists.";
-                                    break;
-                                case "zh":
-                                    msg = "鑰匙名稱已存在";
-                                    break;
-                                default:
-                                    msg = "鑰匙名稱已存在";
-                                    break;
-                            }
-                            result.Message = msg;
-                            return result;
-                        }
-                    }
-                    else
-                    {
-						result.IsSuccess = false;
-						result.Message = "error.";
-						return result;
-					}
-				}
-                catch (Exception e)
-                {
-                    result.IsSuccess = false;
-					result.Message = "error.";
-					return result;
-				}
-            }
-            else
-            {
-				result.IsSuccess = false;
-				result.Message = "error.";
-				return result;
+                return result;
 			}
+            #endregion
 
-			#endregion
-
+            
 
 			// step1 create key
-			url = _config["IP"] + "/security/key/generate";
-            httpMethod = HttpMethod.Post;
+			var url = _config["IP"] + "/security/key/generate";
+            var httpMethod = HttpMethod.Post;
+			var parameters = new Dictionary<string, string>
+			{
+
+			};
 
-            if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key1))
+			if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key1))
             {
                 parameters = new Dictionary<string, string>
                 {
                    { "QRData","["+key1+","+key2+"]"}
                 };
             }
-            apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+            var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
             if (apiResult.IsSuccess)
             {
                 try
@@ -430,75 +384,24 @@ namespace backstage.Controllers
             string msg;
 
 			#region name重複檢查
-			var url = _config["IP"] + "/security/key/list";
-			var httpMethod = HttpMethod.Post;
-			var parameters = new Dictionary<string, string>
-			{
-
-			};
-			var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
-			if (apiResult.IsSuccess)
-			{
-				try
-				{
-					var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
-					if (response.r == 0)
-					{
-						var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
-						var keyNameRepeat = keylist.Where(x => x.name == name).FirstOrDefault();
-						if (keyNameRepeat != null)
-						{
-							result.IsSuccess = false;
-							switch (_currentLanguage)
-							{
-								case "en":
-									msg = "key name already exists.";
-									break;
-								case "zh":
-									msg = "鑰匙名稱已存在";
-									break;
-								default:
-									msg = "鑰匙名稱已存在";
-									break;
-							}
-							result.Message = msg;
-							return result;
-						}
-					}
-					else
-					{
-						result.IsSuccess = false;
-						result.Message = "error.";
-						return result;
-					}
-				}
-				catch (Exception e)
-				{
-					result.IsSuccess = false;
-					result.Message = "error.";
-					return result;
-				}
-			}
-			else
+			result = await CheckNameRepeat(name, keyId);
+			if (!result.IsSuccess)
 			{
-				result.IsSuccess = false;
-				result.Message = "error.";
 				return result;
 			}
-
 			#endregion
 
 			#region key/list
-			url = _config["IP"] + "/security/key";
-            httpMethod = HttpMethod.Put;
-            parameters = new Dictionary<string, string>
+			var url = _config["IP"] + "/security/key";
+            var httpMethod = HttpMethod.Put;
+            var parameters = new Dictionary<string, string>
             {
              { "id",keyId.ToString()},
              { "name",name},
              { "active",active.ToString()},
             };
 
-            apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+            var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
             if (apiResult.IsSuccess)
             {
                 try
@@ -551,6 +454,77 @@ namespace backstage.Controllers
         }
 
 
+		/// <summary>
+		/// 檢查name重複
+		/// </summary>
+		/// <param name="name"></param>
+		/// <param name="id">預設值:0，檢查時跳過自己</param>
+		/// <returns></returns>
+		public async Task<ResultModel> CheckNameRepeat(string name, int id = 0)
+        {
+            var result = new ResultModel();
+            result.IsSuccess = true;
+			var msg = "";
+			
+			var url = _config["IP"] + "/security/key/list";
+			var httpMethod = HttpMethod.Post;
+			var parameters = new Dictionary<string, string>
+			{
+
+			};
+			var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+			if (apiResult.IsSuccess)
+			{
+				try
+				{
+					var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
+					if (response.r == 0)
+					{
+						var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
+						var keyNameRepeat = keylist.Where(x => x.name == name).FirstOrDefault();
+
+						if (keyNameRepeat != null && keyNameRepeat.id != id)
+						{
+							result.IsSuccess = false;
+							switch (_currentLanguage)
+							{
+								case "en":
+									msg = "key name already exists.";
+									break;
+								case "zh":
+									msg = "鑰匙名稱已存在";
+									break;
+								default:
+									msg = "鑰匙名稱已存在";
+									break;
+							}
+							result.Message = msg;
+							return result;
+						}
+					}
+					else
+					{
+						result.IsSuccess = false;
+						result.Message = "error.";
+						return result;
+					}
+				}
+				catch (Exception e)
+				{
+					result.IsSuccess = false;
+					result.Message = "error.";
+					return result;
+				}
+			}
+			else
+			{
+				result.IsSuccess = false;
+				result.Message = "error.";
+				return result;
+			}
+
+            return result;
+		}
 
-    }
+	}
 }
\ No newline at end of file

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

@@ -25,7 +25,6 @@ using System.Dynamic;
 using TokenVault_management.Models;
 using Microsoft.Extensions.Localization;
 using Microsoft.AspNetCore.Localization;
-using DocumentFormat.OpenXml.Wordprocessing;
 
 namespace backstage.Controllers
 {

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

@@ -186,7 +186,7 @@
 		<!-- partial:./partials/_sidebar.html -->
 		<nav class="sidebar sidebar-offcanvas" id="sidebar">
 			<div class="versionNo">
-				@Localizer["version"]: v2.31
+				@Localizer["version"]: v2.32
 			</div>
 			<ul class="nav ">
 				<li class="nav-item">