Changeset 7553 for branches/ClientUserManagement/HeuristicLab.Services.Access/3.3

Timestamp:

03/05/12 22:29:59 (13 years ago)

Author:

ascheibe

Message:

#1648 adapted client management for use with Hive

File:

• branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (3 diffs)

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -663 +663 @@
     #region UserGroupBase
     public IEnumerable<DT.UserGroupBase> GetAllLeightweightUsersAndGroups() {
+      //TODO: it must be possible to include a role so not all users are returned but only the ones who are allowed to use a certain service
+      List<DT.UserGroup> userGroups = new List<DT.UserGroup>();
+      List<DT.UserGroupBase> result = new List<DT.UserGroupBase>();
+
+      // this is just for generating users from asp.net authenticaton db; we should maybe provide an updatescript instead
+      List<Guid> accessUserGuids = null;
+      using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
+        var query = from u in context.aspnet_Users
+                    select u.UserId;
+        accessUserGuids = query.ToList();
+      }
+      var lightweightUsers = accessUserGuids.Select(x => BuildLightweightUserDto(x));
+
+      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+        var query = from u in context.UserGroupBases.OfType<DA.UserGroup>()
+                    select Convert.ToDto(u);
+        userGroups = query.ToList();
+      }
+
+      result.AddRange(lightweightUsers);
+      result.AddRange(userGroups);
+
+      return result;
+    }
+
+    public IEnumerable<DT.UserGroupBase> GetLeightweightUsersAndGroups(IEnumerable<Guid> ids) {
       List<DA.UserGroupBase> dbUserGroupsBases = new List<DA.UserGroupBase>();
       List<DT.UserGroupBase> result = new List<DT.UserGroupBase>();
@@ -668 +694 @@
       using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
         var query = from u in context.UserGroupBases
+                    where ids.Contains(u.Id)
                     select u;
         dbUserGroupsBases = query.ToList();
@@ -683 +710 @@
       return result;
     }
-
-    public IEnumerable<DT.UserGroupBase> GetLeightweightUsersAndGroups(IEnumerable<Guid> ids) {
-      List<DA.UserGroupBase> dbUserGroupsBases = new List<DA.UserGroupBase>();
-      List<DT.UserGroupBase> result = new List<DT.UserGroupBase>();
-
-      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
-        var query = from u in context.UserGroupBases
-                    where ids.Contains(u.Id)
-                    select u;
-        dbUserGroupsBases = query.ToList();
-      }
-
-      foreach (var ugb in dbUserGroupsBases) {
-        if (ugb.GetType() == typeof(DA.User)) {
-          var user = BuildLightweightUserDto(ugb.Id);
-          result.Add(user);
-        } else if (ugb.GetType() == typeof(DA.UserGroup)) {
-          var group = Convert.ToDto(ugb as DA.UserGroup);
-          result.Add(group);
-        }
-      }
-      return result;
-    }
     #endregion