Changeset 13847 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services

Timestamp:

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

Author:

jlodewyc

Message:

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

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services

Files:

• Jobs/FileOpeningService.cs (modified) (2 diffs)
• WebLoginService.cs (modified) (6 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs/FileOpeningService.cs

@@ -43 +43 @@
         public void NewModel()
         {
-            vm = new FileOpeningViewModel();
+            vm = new FileOpeningViewModel(weblog.getCurrentUser(UserId));
             Job = new RefreshableJob();
 
@@ -80 +80 @@
             return null;
         }
-        public void SaveToFile(string file)
+        public void SaveToFile(string file, string dname)
         {
             if(vm != null)
             {
                 var uploads = Path.Combine(env.WebRootPath, "uploads", weblog.getServiceLocator(UserId).getHiveServiceClient().ClientCredentials.UserName.UserName,
-                    "HiveChanged");
+                    dname);
                 Directory.CreateDirectory(uploads);
                 var cont = Job.HiveTasks.First().ItemTask.Item;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/WebLoginService.cs

@@ -1 +1 @@
 using HeuristicLab.Clients.Access.Administration;
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using System;
@@ -23 +24 @@
         private List<AccessAdministrationClient> accessclients;
         private List<HiveAdminClientWeb> adminclients;
+        private List<HiveWebUser> loggedinUsers;
         /// <summary>
         /// Service instance that keeps all the information per user seperated. Data is in  different lists so 
@@ -51 +53 @@
             accessclients = new List<AccessAdministrationClient>();
             adminclients = new List<HiveAdminClientWeb>();
+            loggedinUsers = new List<HiveWebUser>();
         }
         /// <summary>
@@ -67 +70 @@
             loggedIn.Add(log);
             locators.Add(loc);
-            var temp = new HiveClientWeb(loc, log.userId);
-            webclients.Add(temp);
-            var temp2 = new FileOpeningService(log.userId);
-            fileopeners.Add(temp2);
-            temp2 = new FileOpeningService(log.userId);
-            jobopeners.Add(temp2);
-            var temp3 = new AccessAdministrationClient(log.userId);
-            accessclients.Add(temp3);
-            var temp4 = new HiveAdminClientWeb(log.userId);
-            adminclients.Add(temp4);
+            webclients.Add(new HiveClientWeb(loc, log.userId));
+            fileopeners.Add(new FileOpeningService(log.userId));
+            jobopeners.Add(new FileOpeningService(log.userId));
+            accessclients.Add(new AccessAdministrationClient(log.userId));
+            adminclients.Add(new HiveAdminClientWeb(log.userId));
+            loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName).updateUserInfo());
         }
         /// <summary>
@@ -150 +149 @@
             return adminclients.Find(x => x.userId == id);
         }
+        public HiveWebUser getCurrentUser(Guid id)
+        {
+            return loggedinUsers.Find(x => x.webIdToken == id);
+        }
         /// <summary>
         /// Removes all traces from the logged in user.
@@ -164 +167 @@
             adminclients.RemoveAll(x => x.userId == id);
             loggedIn.RemoveAll(x => x.userId == id);
-
+            loggedinUsers.RemoveAll(x => x.webIdToken == id);
         }
     }