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

Timestamp:

04/12/16 15:28:19 (8 years ago)

Author:

jlodewyc

Message:

#2582 User management done, start resource calendar

Location:

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

Files:

• Imports/AccessAdministrationClient.cs (modified) (2 diffs)
• Imports/HiveAdminClientWeb.cs (added)
• WebLoginService.cs (modified) (5 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/AccessAdministrationClient.cs

@@ -251 +251 @@
              CallAccessService(s => s.UpdateUser(u));
         }
+        public List<Role> getRoles(User u)
+        {
+            return CallAccessService(s => s.GetUserRoles(u));
+        }
+        public void addRoleToUser(User u, Role r)
+        {
+            CallAccessService(s => s.AddUserToRole(r, u));
+        }
+        public void deleteUserRole(User u, Role r)
+        {
+            CallAccessService(s => s.RemoveUserFromRole(r, u));
+        }
         #endregion
 
@@ -331 +343 @@
         }
         #endregion
+
+        #region Roles
+        public Role addRole(Access.Role r)
+        {
+            return CallAccessService(s => s.AddRole(r));
+        }
+        public void deleteRole(string name)
+        {
+            Role r = Roles.Find(x => x.Name == name);
+            CallAccessService(s => s.DeleteRole(r));
+        }
+
+        public List<UserGroupBase> getEnrolled(Role r)
+        {
+            var enroll = new List<UserGroupBase>();
+            RefreshUsers();
+            foreach(var us in users)
+            {
+                var temp = CallAccessService(s => s.GetUserRoles(us));
+                if (temp.Contains(r))
+                    enroll.Add(us);                
+            }
+
+            return enroll;
+        }
+        #endregion
+
 
         #region Helpers

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

@@ -21 +21 @@
         private List<FileOpeningService> fileopeners;
         private List<AccessAdministrationClient> accessclients;
+        private List<HiveAdminClientWeb> adminclients;
         /// <summary>
         /// Service instance that keeps all the information per user seperated. Data is in  different lists so 
@@ -47 +48 @@
             fileopeners = new List<FileOpeningService>();
             accessclients = new List<AccessAdministrationClient>();
+            adminclients = new List<HiveAdminClientWeb>();
         }
         /// <summary>
@@ -69 +71 @@
             var temp3 = new AccessAdministrationClient(log.userId);
             accessclients.Add(temp3);
+            var temp4 = new HiveAdminClientWeb(log.userId);
+            adminclients.Add(temp4);
         }
         /// <summary>
@@ -124 +128 @@
             return accessclients.Find(x => x.userId == id);
         }
+        public HiveAdminClientWeb getAdminClient(Guid id)
+        {
+            return adminclients.Find(x => x.userId == id);
+        }
         /// <summary>
         /// Removes all traces from the logged in user.
@@ -135 +143 @@
             fileopeners.RemoveAll(x => x.UserId == id);
             accessclients.RemoveAll(x => x.userId == id);
+            adminclients.RemoveAll(x => x.userId == id);
             loggedIn.RemoveAll(x => x.userId == id);
+
         }
     }