Changeset 13741 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Timestamp:

03/31/16 16:59:16 (9 years ago)

Author:

jlodewyc

Message:

#2582 Users: Load, show info, update and add

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Files:

• HomeController.cs (modified) (2 diffs)
• UserController.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs

@@ -57 +57 @@
                 Common.Properties.Settings.Default.Save();
                 hiveServiceLocator.Username = loginName;
-                hiveServiceLocator.Password = password;
+                hiveServiceLocator.Password = password;//Not encrypted for login to service
                 hiveServiceLocator.UserId = model.userId;
 
@@ -73 +73 @@
                     model = new LoginViewModel();
                     model.errorMessage = "Wrong login, try again";
+                    return View("Index", model);
+                }
+                catch(SecurityAccessDeniedException e)
+                {
+                    ViewBag.Title = "Access denied - Login";
+                    model = new LoginViewModel();
+                    model.errorMessage = "Access denied, you have no permission to use this application." +
+                        "              Contact a HeuristicLab Hive admin to gain access.";
                     return View("Index", model);
                 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

@@ -50 +50 @@
 
                 ViewBag.Title = "Users";
-                // accessClient.RefreshUsers();
-                UserViewModel vm = new UserViewModel();
-                vm.users = new List<string>() { "Jean" };
+                UserViewModel vm = new UserViewModel(accessClient).refreshUsers();
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 return View("Index", vm);
             }
@@ -60 +59 @@
             }
         }
+
         public IActionResult SelectUser(string id)
         {
@@ -66 +66 @@
             {
                 Guid curr = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel();
-                vm.users = new List<string>() { "Jean" };
+                
+                UserViewModel vm = new UserViewModel(accessClient).refreshUsers();
                 if (curr == Guid.Empty)
                 {
-                    vm.SelectedUser = "";
                     ViewBag.Title = "Add User";
                 }
                 else
                 {
-                    vm.SelectedUser = "Jean";
-                    ViewBag.Title = "Jean";
+                    vm.SelectedUser = vm.getUserById(curr);
+                    ViewBag.title = vm.SelectedUser.UserName;
                 }
                 ViewBag.Title += " - Users";
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 return View("Index", vm);
             }
@@ -86 +86 @@
             }
         }
+        [HttpPost]
+        public IActionResult saveUser(string inpusername, string inpfullname, string inpemail, string u)
+        {
+            init();
+            var uid = Guid.Parse(u);
+            Access.User user;
+            if (uid == Guid.Empty)
+                user = new Access.User();
+            else
+                user = accessClient.Users.Find(x => x.Id == uid);
+
+            user.Id = uid;
+            user.UserName = inpusername;
+            user.FullName = inpfullname;
+            user.Email = inpemail;
+
+
+            if (uid == Guid.Empty)
+            {
+                uid = accessClient.addUser(user);
+                ViewBag.Title = inpusername + " added - User";
+            }
+            else
+            {
+                accessClient.updateUser(user);
+                ViewBag.Title = inpusername + " updated - User";
+            }
+
+            return RedirectToAction( "SelectUser", new {  id =  uid.ToString()});
+
+        }
+
         #endregion