Merge branch 'master' into alice

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

@@ -16,7 +16,7 @@ namespace backstage.Controllers
 {
 
 
-    //[Authorize]
+    [Authorize]
     public class HomeController : Controller
     {
 

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

@@ -96,7 +96,7 @@ namespace backstage.Controllers
                             string role = "";
                             if (user.username == "theone")
                             {
-                                 role = "Admin";
+                                role = "Admin";
                             }
                             else
                             {
@@ -106,7 +106,7 @@ namespace backstage.Controllers
                                 httpMethod = HttpMethod.Post;
                                 var types = new[] { "admin" };
                                 var types_data = new { inc = types };
-                                 role = "Merchant";
+                                role = "Merchant";
 
                                 parameters = new Dictionary<string, string>
                               {
@@ -469,12 +469,13 @@ namespace backstage.Controllers
                 TempData["msg"] = "發生錯誤";
                 return Redirect("~" + returnUrl);
             }
-            else {
+            else
+            {
 
 
                 ViewBag.returnUrl = returnUrl;
                 return View();
-               
+
 
             }
 
@@ -581,7 +582,11 @@ namespace backstage.Controllers
             return View();
         }
 
-
+        /// <summary>
+        /// 編輯使用者
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
         [Authorize]
         [HttpPost]
         public async Task<IActionResult> GetUser(User user)
@@ -643,15 +648,16 @@ namespace backstage.Controllers
                         if (existUserName.uid != user.uid)
                             ModelState.AddModelError("username", "username重複");
                     }
+
                     if (!ModelState.IsValid)
                     {
                         return View(user);
                     }
-
+                    //檢查通過
+                    //修改基本資料
                     existUser.name = user.name;
                     existUser.username = user.username;
 
-                    //檢查通過
                     url = _config["IP"] + "/user/mod";
 
 
@@ -668,10 +674,49 @@ namespace backstage.Controllers
                     {
                         TempData["IsSuccess"] = true;
                         TempData["msg"] = "編輯成功";
+
+                        //修改密碼
+                        if (!string.IsNullOrEmpty(user.newPassword))
+                        {
+                            existUser.password = user.newPassword;
+                            url = _config["IP"] + "/user/changepassword";
+
+                            parameters = new Dictionary<string, string>
+                             {
+                                    { "token", token },
+                                { "oldpwd",user.password},
+                                { "newpwd",user.newPassword}
+
+
+                                };
+
+                            apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+                            if (apiResult.IsSuccess)
+                            {
+                                var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
+                                if (response.r == 0)
+                                {
+                                    TempData["IsSuccess"] = true;
+                                    TempData["msg"] = "編輯成功";
+
+                                }
+                                else
+                                {
+                                    TempData["IsSuccess"] = false;
+                                    TempData["msg"] = response.m;
+                                    return View();
+                                }
+                                return RedirectToAction("ListUsers");
+                            }
+                        }
+
+
+
                         return RedirectToAction("ListUsers");
                     }
 
 
+
                     TempData["IsSuccess"] = false;
                     TempData["msg"] = "user_id不存在";
                     return View(existUser);
@@ -844,7 +889,7 @@ namespace backstage.Controllers
         /// <returns></returns>
         [Authorize(Policy = "AdminOnly")]
         [HttpPost]
-        public async Task<ResultModel> AdminAddAjax(int uid, bool isAdmin)
+        public async Task<ResultModel> AdminAddAjax(int uid, int isAdmin)
         {
             var result = new ResultModel();
 
@@ -902,8 +947,9 @@ namespace backstage.Controllers
             //加入admin list
             if (existAdmin == null)
             {
-                if (isAdmin == true)
+                if (isAdmin == 1)
                 {
+                    url = _config["IP"] + "/admin/add";
                     parameters = new Dictionary<string, string>
                   {
                         { "token", token},
@@ -949,7 +995,7 @@ namespace backstage.Controllers
             {
                 url = _config["IP"] + "/admin/mod";
                 httpMethod = HttpMethod.Post;
-                existAdmin.enabled = isAdmin ? 1 : 0;
+                existAdmin.enabled = isAdmin;
 
                 parameters = new Dictionary<string, string>
                 {