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

Timestamp:

01/18/12 17:21:13 (12 years ago)

Author:

ascheibe

Message:

#1648

• updated frame files
• added a lightweight user dto for non-admin users
• added access service roles
• some more minor changes

Location:

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3

Files:

• AccessService.cs (modified) (3 diffs)
• AccessServiceRoles.cs (added)
• App.config (modified) (1 diff)
• Convert.cs (modified) (1 diff)
• DataTransfer/LightweightUser.cs (added)
• DataTransfer/User.cs (modified) (2 diffs)
• DataTransfer/UserGroupBase.cs (modified) (1 diff)
• HeuristicLab.Services.Access-3.3.csproj (modified) (3 diffs)
• IAccessService.cs (modified) (2 diffs)
• Properties/AssemblyInfo.cs.frame (moved) (moved from branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Properties/AssemblyInfo.frame) (1 diff)

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

@@ -278 +278 @@
       DA.User accessUser = null;
 
+      //TODO: add user to userdb if there is only data available in the asp.net authentication db
       using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
         var query = from u in context.UserGroupBases.OfType<DA.User>()
@@ -311 +312 @@
     }
 
+    private DT.LightweightUser BuildLightweightUserDto(Guid userId) {
+      DA.aspnet_User aspUser = null;
+      DA.User accessUser = null;
+
+      //TODO: add user to userdb if there is only data available in the asp.net authentication db
+      using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
+        var userQuery = from u in context.aspnet_Users
+                        where u.UserId == userId
+                        select u;
+        if (userQuery.Count() == 1) {
+          aspUser = userQuery.First();
+        }
+      }
+
+      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+        var query = from u in context.UserGroupBases.OfType<DA.User>()
+                    where u.Id == userId
+                    select u;
+        if (query.Count() == 1) {
+          accessUser = query.First();
+        }
+      }
+
+      if (aspUser == null || accessUser == null) {
+        //TODO: error handling
+        return null;
+      } else {
+        return Convert.ToDto(accessUser, aspUser);
+      }
+    }
+
     public DT.User Login() {
       Guid userId = UserManager.CurrentUserId;
       return BuildUserDto(userId);
+    }
+
+    public IEnumerable<DT.LightweightUser> GetAllLightweightUsers() {
+      List<Guid> accessUserGuids = null;
+
+      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+        var query = from u in context.UserGroupBases.OfType<DA.User>()
+                    select u.Id;
+        accessUserGuids = query.ToList();
+      }
+
+      return accessUserGuids.Select(x => BuildLightweightUserDto(x));
     }
 
@@ -445 +489 @@
     }
 
+    public IEnumerable<DT.UserGroup> GetUserGroupsOfUser(Guid userId) {
+
+      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+        var groupIds = from g in context.UserGroupUserGroups
+                       where g.UserGroupId == userId
+                       select g.UserGroupUserGroupId;
+
+        var query = from g in context.UserGroupBases.OfType<DA.UserGroup>()
+                    where groupIds.Contains(g.Id)
+                    select Convert.ToDto(g);
+
+        return query.ToList();
+      }
+    }
+
     public IEnumerable<DT.UserGroup> GetUserGroups(IEnumerable<Guid> ids) {
       using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/App.config

@@ -85 +85 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost/AccessService" />
+            <add baseAddress="http://localhost:81/AccessService" />
           </baseAddresses>
         </host>

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

@@ -283 +283 @@
 
     #region User
+
+    public static DT.LightweightUser ToDto(DA.User source, DA.aspnet_User aspUserSource) {
+      return new DT.LightweightUser() {
+        Id = source.Id,
+        FullName = source.FullName,
+        UserName = aspUserSource.UserName
+      };
+    }
+
     public static DT.User ToDto(DA.User source, DA.aspnet_User aspUserSource, DA.aspnet_Membership aspMembershipSource) {
       return new DT.User() {

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
@@ -36 +35 @@
     public string Email { get; set; }
     [DataMember]
-    public IEnumerable<UserGroup> UserGroups { get; set; }
-    [DataMember]
     public DateTime CreationDate { get; set; }
     [DataMember]

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

@@ -26 +26 @@
   [DataContract]
   [KnownType(typeof(User))]
+  [KnownType(typeof(LightweightUser))]
   [KnownType(typeof(UserGroup))]
   public class UserGroupBase : AccessItem {

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj

@@ -55 +55 @@
   <ItemGroup>
     <Compile Include="AccessServiceLocator.cs" />
+    <Compile Include="AccessServiceRoles.cs" />
     <Compile Include="Convert.cs" />
     <Compile Include="DataTransfer\Client.cs" />
@@ -65 +66 @@
     <Compile Include="DataTransfer\ClientType.cs" />
     <Compile Include="DataTransfer\Country.cs" />
+    <Compile Include="DataTransfer\LightweightUser.cs" />
     <Compile Include="DataTransfer\OperatingSystem.cs" />
     <Compile Include="DataTransfer\Plugin.cs" />
@@ -85 +87 @@
     <None Include="App.config" />
     <None Include="HeuristicLab.snk" />
-    <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <ItemGroup>

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

@@ -104 +104 @@
 
     #region User
+    //TODO: i don't think this method is needed
     [OperationContract]
     User Login();
 
     [OperationContract]
+    IEnumerable<LightweightUser> GetAllLightweightUsers();
+
+    [OperationContract]
     IEnumerable<User> GetAllUsers();
 
@@ -135 +139 @@
     [OperationContract]
     IEnumerable<UserGroup> GetAllUserGroups();
+
+    [OperationContract]
+    IEnumerable<UserGroup> GetUserGroupsOfUser(Guid userId);
 
     [OperationContract]

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.5.0")]
-[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]