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

Timestamp:

05/20/16 13:01:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Core update, pre migration

Location:

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

Files:

• HomeController.cs (modified) (4 diffs)
• JobController.cs (modified) (8 diffs)
• ResourceController.cs (modified) (2 diffs)
• UserController.cs (modified) (7 diffs)

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

@@ -31 +31 @@
             ViewBag.Title = "Login";
             var user = HttpContext.Session.GetString("UserId");
-            if(user != null && user != "")
+            if (user != null && user != "")
             {
                 Guid t = Guid.Parse(user);
@@ -61 +61 @@
 
                 client = hiveServiceLocator.getHiveServiceClient();
-                try {
+                try
+                {
                     var test = client.GetJobs();//Throws messageSecurityException if login failss
                     ViewBag.Title = "Login succesful";
                     weblog.newLogin(model, hiveServiceLocator);
                     HttpContext.Session.SetString("UserId", model.userId.ToString());
-                    return RedirectToAction("Index","Job");
+                    return RedirectToAction("Index", "Job");
                 }
-                catch(MessageSecurityException e)
+                catch (MessageSecurityException e)
                 {
                     ViewBag.Title = "Login";
@@ -75 +76 @@
                     return View("Index", model);
                 }
-                catch(SecurityAccessDeniedException e)
+                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);
+                    var q = new QueryWebClient(model, password);
+                    if (q.CheckLogin())
+                    {
+                        ViewBag.Title = "Login succesful";
+                        weblog.newLoginOKBOnly(model,q);
+                        HttpContext.Session.SetString("UserId", model.userId.ToString());
+                        return RedirectToAction("Index", "Query");
+                    }
+                    else
+                    {
+                        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);
+                    }
+
                 }
 
@@ -99 +112 @@
         public IActionResult Logout()
         {
-            return RedirectToAction("Index","Home");
+            return RedirectToAction("Index", "Home");
         }
         #endregion

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

@@ -40 +40 @@
         {
             weblog = WebLoginService.Instance;
-            
+
             _environment = env;
         }
@@ -50 +50 @@
         {
             var u = HttpContext.Session.GetString("UserId");
-            
+
             if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
             {
@@ -60 +60 @@
                 vm = new JobViewModel(weblog.getCurrentUser(userId));
                 upper = new UploadedJobViewModel(weblog.getCurrentUser(userId));
-
-                serviceLocator = weblog.getServiceLocator(userId);
-                serviceClient = serviceLocator.getHiveServiceClient();
-                clientWeb = weblog.getClientWeb(userId);
-                
-                return serviceLocator.CheckLogin();
-            }
+                try
+                {
+                    serviceLocator = weblog.getServiceLocator(userId);
+                    serviceClient = serviceLocator.getHiveServiceClient();
+                    clientWeb = weblog.getClientWeb(userId);
+                    if (serviceLocator != null && serviceClient != null && clientWeb != null)
+                        return serviceLocator.CheckLogin();
+                }
+                catch (NullReferenceException)
+                {
+                    return false;
+                }
+            }
+            return false;
         }
 
@@ -200 +207 @@
                 fillUploadsPaths(upper, -1);
                 var ind = upper.DisplayDatePaths.IndexOf(olddir);
-                try { 
-                
-                
-                var start = Path.Combine(_environment.WebRootPath, "uploads", serviceClient.ClientCredentials.UserName.UserName, dirname);
+                try
+                {
+
+
+                    var start = Path.Combine(_environment.WebRootPath, "uploads", serviceClient.ClientCredentials.UserName.UserName, dirname);
                     if (Directory.Exists(start))
                     {
                         var files = Directory.GetFiles(upper.FullDatePaths[ind]);
-                        foreach(var f in files) {
+                        foreach (var f in files)
+                        {
                             var target = start + "\\" + f.Split('\\').Last();
                             if (System.IO.File.Exists(target))
                                 System.IO.File.Delete(target);
                             System.IO.File.Move(f, target);
-                                }
+                        }
                     }
                     else
@@ -218 +227 @@
                         Directory.Move(upper.FullDatePaths[ind], start);
                     }
-                
-                upper.clear();
-                fillUploadsPaths(upper, -1);
-                ind = upper.DisplayDatePaths.IndexOf(dirname);
-                upper.clear();
-                return RedirectToAction("UploadDir",new { index=ind});
-                }catch(IOException e)
+
+                    upper.clear();
+                    fillUploadsPaths(upper, -1);
+                    ind = upper.DisplayDatePaths.IndexOf(dirname);
+                    upper.clear();
+                    return RedirectToAction("UploadDir", new { index = ind });
+                }
+                catch (IOException e)
                 {
                     upper.clear();
                     fillUploadsPaths(upper, ind);
                     upper.message = "Error in new directory name. Try again and don't use any special signs";
-                    ViewBag.Title = "Error renaming - "+ upper.DisplayDatePaths[ind] + " - Uploads";
+                    ViewBag.Title = "Error renaming - " + upper.DisplayDatePaths[ind] + " - Uploads";
                     if (weblog.getFileOpener(userId).Job != null)
                         ViewBag.active = true;
@@ -247 +257 @@
         private void fillUploadsPaths(UploadedJobViewModel vm, int index)
         {
-            
+
             var tempdex = index; //Fix when maps gets deleted
             var start = Path.Combine(_environment.WebRootPath, "uploads", serviceClient.ClientCredentials.UserName.UserName);
@@ -254 +264 @@
                 Directory.GetDirectories(start);
             }
-            catch(DirectoryNotFoundException e)
+            catch (DirectoryNotFoundException e)
             {
                 Directory.CreateDirectory(start);
@@ -407 +417 @@
                 fillUploadsPaths(upper, -1);
                 var ind = upper.DisplayDatePaths.IndexOf(dname);
-                return RedirectToAction("UploadDir", new { index = ind});
+                return RedirectToAction("UploadDir", new { index = ind });
             }
             else

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

@@ -47 +47 @@
             else
             {
+                try {
                 userId = Guid.Parse(u);
                 serviceLocator = weblog.getServiceLocator(userId);
@@ -56 +57 @@
                 else
                     return false;
+                }
+                catch (NullReferenceException)
+                {
+                    return false;
+                }
             }
         }

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

@@ -36 +36 @@
         /// </summary>
         /// <returns></returns>
-        
+
         private bool init()
         {
@@ -46 +46 @@
             else
             {
-                userId = Guid.Parse(u);
-                serviceLocator = weblog.getServiceLocator(userId);
-                accessClient = weblog.getAccessAdminClient(userId);
-                vm = new UserViewModel(accessClient, weblog.getCurrentUser(userId));
-                if (weblog.getCurrentUser(userId).HasUserAdminAccess())
-                    return serviceLocator.CheckLogin();
-                else
+                try
+                {
+                    userId = Guid.Parse(u);
+                    serviceLocator = weblog.getServiceLocator(userId);
+                    accessClient = weblog.getAccessAdminClient(userId);
+                    vm = new UserViewModel(accessClient, weblog.getCurrentUser(userId));
+                    if (weblog.getCurrentUser(userId).HasUserAdminAccess())
+                        return serviceLocator.CheckLogin();
+                    else
+                        return false;
+                }
+                catch (NullReferenceException)
+                {
                     return false;
-                 
+                }
             }
         }
@@ -67 +73 @@
             {
                 ViewBag.Title = "Users";
-                vm.refreshAll() ;
+                vm.refreshAll();
                 //Refreshall for users, groups and roles 
                 ViewBag.SessionId = HttpContext.Session.GetString("UserId");
@@ -77 +83 @@
             }
         }
-        
+
         public IActionResult SelectUser(string id)
         {
@@ -158 +164 @@
                 }
                 accessClient.RefreshUserGroups();
-                foreach(var g in groupstoadd)
+                foreach (var g in groupstoadd)
                 {//loop to subscribe to groups
                     var gid = Guid.Parse(g);
@@ -206 +212 @@
 
                 vm.refreshAll();
-                
-                    var us = vm.getUserById(curr);
+
+                var us = vm.getUserById(curr);
                 us.IsApproved = true;
                 accessClient.updateUser(us);
@@ -291 +297 @@
                 var user = vm.getUserById(mid);
                 var gr = vm.getGroupById(gid);
-                
+
                 accessClient.deleteMember(user, gr);
-                return RedirectToAction("SelectUser", new { id = id});
+                return RedirectToAction("SelectUser", new { id = id });
             }
             else