Changeset 13847 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

Timestamp:

05/12/16 17:09:12 (8 years ago)

Author:

jlodewyc

Message:

#2582 Security access implemented, directory renaming and choosing, adding more partials

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs (modified) (32 diffs)

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

@@ -24 +24 @@
         private Guid userId;
 
+        private UserViewModel vm;
         private IHostingEnvironment _environment;
 
@@ -47 +48 @@
                 serviceLocator = weblog.getServiceLocator(userId);
                 accessClient = weblog.getAccessAdminClient(userId);
-                return serviceLocator.CheckLogin();
+                vm = new UserViewModel(accessClient, weblog.getCurrentUser(userId));
+                if (weblog.getCurrentUser(userId).HasUserAdminAccess())
+                    return serviceLocator.CheckLogin();
+                else
+                    return false;
                  
             }
@@ -61 +66 @@
             {
                 ViewBag.Title = "Users";
-                UserViewModel vm = new UserViewModel(accessClient).refreshAll() ;
+                vm.refreshAll() ;
                 //Refreshall for users, groups and roles 
                 ViewBag.SessionId = HttpContext.Session.GetString("UserId");
@@ -68 +73 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -78 +83 @@
                 Guid curr = Guid.Parse(id);
 
-                UserViewModel vm = new UserViewModel(accessClient).refreshAll();
+                vm.refreshAll();
                 if (curr == Guid.Empty)
                 {//new user
@@ -97 +102 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -162 +167 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
 
@@ -199 +204 @@
                 Guid curr = Guid.Parse(id);
 
-                UserViewModel vm = new UserViewModel(accessClient).refreshAll();
+                vm.refreshAll();
                 
                     var us = vm.getUserById(curr);
@@ -209 +214 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -222 +227 @@
             {
                 var uid = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel(accessClient).refreshUsers();
+                vm.refreshUsers();
 
                 if (uid == Guid.Empty)
@@ -241 +246 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
 
@@ -256 +261 @@
             {
                 var uid = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel(accessClient).refreshAll();
+                vm.refreshAll();
 
                 var user = vm.getUserById(uid);
@@ -266 +271 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -281 +286 @@
                 var gid = Guid.Parse(group);
                 var mid = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel(accessClient).refreshGroups().refreshUsers();
+                vm.refreshGroups().refreshUsers();
 
                 var user = vm.getUserById(mid);
@@ -291 +296 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
 
@@ -308 +313 @@
 
                 ViewBag.Title = "Groups";
-                UserViewModel vm = new UserViewModel(accessClient).refreshGroups().refreshUsers();
+                vm.refreshGroups().refreshUsers();
                 return View("Groups", vm);
             }
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -327 +332 @@
                 Guid curr = Guid.Parse(id);
 
-                UserViewModel vm = new UserViewModel(accessClient)
+                vm
                     .refreshGroups()
                     .refreshUsers();
@@ -345 +350 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -362 +367 @@
             {
                 var uid = Guid.Parse(u);
-                var vm = new UserViewModel(accessClient).refreshGroups().refreshUsers();
+                vm.refreshGroups().refreshUsers();
 
                 Access.UserGroup group;
@@ -403 +408 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -416 +421 @@
             {
                 var uid = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel(accessClient).refreshGroups();
+                vm.refreshGroups();
 
                 if (uid == Guid.Empty)
@@ -434 +439 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
 
@@ -450 +455 @@
                 var gid = Guid.Parse(g);
                 var mid = Guid.Parse(m);
-                UserViewModel vm = new UserViewModel(accessClient).refreshGroups().refreshUsers();
+                vm.refreshGroups().refreshUsers();
 
                 if (gid == Guid.Empty || mid == Guid.Empty)
@@ -473 +478 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
 
@@ -490 +495 @@
 
                 ViewBag.Title = "Roles";
-                UserViewModel vm = new UserViewModel(accessClient).refreshRoles();
+                vm.refreshRoles();
 
                 return View("Roles", vm);
@@ -496 +501 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -509 +514 @@
             {
 
-                UserViewModel vm = new UserViewModel(accessClient).refreshRoles();
+                vm.refreshRoles();
                 if (name == "" || name == null)
                 {//Add role
@@ -526 +531 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -552 +557 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -569 +574 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }
@@ -583 +588 @@
             {
                 var uid = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel(accessClient).refreshAll();
+                vm.refreshAll();
 
                 var user = vm.getUserById(uid);
@@ -593 +598 @@
             else
             {
-                return RedirectToAction("Index", "Home");
+                return RedirectToAction("Index", "Job");
             }
         }