Changeset 7599 for branches/ClientUserManagement/HeuristicLab.Services.Access

Timestamp:

03/12/12 17:22:59 (12 years ago)

Author:

ascheibe

Message:

#1648 added first version of an user information dialog

Location:

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3

Files:

• AccessService.cs (modified) (4 diffs)
• Convert.cs (modified) (2 diffs)
• DataTransfer/LightweightUser.cs (modified) (2 diffs)

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

@@ -347 +347 @@
       DA.aspnet_User aspUser = null;
       DA.User accessUser = null;
+      List<DA.aspnet_Role> roles = new List<DA.aspnet_Role>();
+      List<DA.UserGroup> groups = new List<DA.UserGroup>();
+
 
       using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
@@ -354 +357 @@
         if (userQuery.Count() == 1) {
           aspUser = userQuery.First();
+          roles = (from ur in context.aspnet_UsersInRoles
+                   where ur.UserId == aspUser.UserId
+                   join r in context.aspnet_Roles on ur.RoleId equals r.RoleId
+                   select r).ToList();
         }
       }
@@ -364 +371 @@
           if (query.Count() == 1) {
             accessUser = query.First();
+            groups = (from ug in context.UserGroupUserGroups
+                      where ug.UserGroupUserGroupId == accessUser.Id
+                      join g in context.UserGroupBases.OfType<DA.UserGroup>() on ug.UserGroupId equals g.Id
+                      select g).ToList();
           } else {
             //if the user is not in the access db add it (this makes it easy to upgrade with an existing asp.net authentication db)
@@ -379 +390 @@
         throw new Exception("User with id " + userId + " not found.");
       } else {
-        return Convert.ToDto(accessUser, aspUser);
+        return Convert.ToDto(accessUser, aspUser, roles, groups);
       }
     }

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using DA = HeuristicLab.Services.Access.DataAccess;
@@ -286 +287 @@
     #region User
 
-    public static DT.LightweightUser ToDto(DA.User source, DA.aspnet_User aspUserSource) {
+    public static DT.LightweightUser ToDto(DA.User source, DA.aspnet_User aspUserSource, List<DA.aspnet_Role> roles, List<DA.UserGroup> groups) {
       return new DT.LightweightUser() {
         Id = source.Id,
         FullName = source.FullName,
-        UserName = aspUserSource.UserName
+        UserName = aspUserSource.UserName,
+        Roles = roles.Select(x => Convert.ToDto(x)).ToArray(),
+        Groups = groups.Select(x => Convert.ToDto(x)).ToArray()
       };
     }

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/LightweightUser.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
@@ -29 +30 @@
     [DataMember]
     public string FullName { get; set; }
+    [DataMember]
+    public IEnumerable<DataTransfer.Role> Roles { get; set; }
+    [DataMember]
+    public IEnumerable<DataTransfer.UserGroup> Groups { get; set; }
   }
 }