Changeset 7553

Timestamp:

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

Author:

ascheibe

Message:

#1648 adapted client management for use with Hive

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/ClientInformation.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/HeuristicLab.Clients.Access-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/Settings.Designer.cs (added)
• HeuristicLab.Clients.Access/3.3/Settings.settings (added)
• HeuristicLab.Clients.Access/3.3/UserInformation.cs (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (3 diffs)

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientInformation.cs

@@ -54 +54 @@
 
     private ClientInformation() {
-      FetchClientInformationFromServer();
+      if (ClientInformationUtils.IsClientHeuristicLab()) {
+        FetchClientInformationFromServer();
+      } else {
+        // this means we are executed by an Hive slave, therefore we just get our machine id (e.g. for OKB Algs)
+        // because the slave has already done the registration process
+        GenerateLocalClientConfig();
+      }
+    }
+
+    private void GenerateLocalClientConfig() {
+      clientExists = true;
+      errorOccured = false;
+      occuredException = null;
+      clientInfo = new Client();
+      clientInfo.Id = ClientInformationUtils.GetUniqueMachineId();
     }
 

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs

@@ -61 +61 @@
       FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
       return versionInfo.FileVersion;
+    }
+
+    public static bool IsClientHeuristicLab() {
+      return Process.GetCurrentProcess().ProcessName == Settings.Default.HLExeName;
     }
 

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

@@ -138 +138 @@
     <Compile Include="ServiceClients\UserGroup.cs" />
     <Compile Include="ServiceClients\UserGroupBase.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="UserInformation.cs" />
     <Compile Include="Views\LightweightUserGroupSelectionDialog.cs">
@@ -178 +183 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="ServiceClients\GenerateServiceClients.cmd" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
     <None Include="UpdateLocalInstallation.cmd" />
   </ItemGroup>

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/UserInformation.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.ServiceModel.Security;
-using HeuristicLab.Clients.Common.Properties;
 
 namespace HeuristicLab.Clients.Access {
@@ -80 +79 @@
 
     private void FetchUserInformationFromServer() {
-      userName = Settings.Default.UserName;
+      userName = HeuristicLab.Clients.Common.Properties.Settings.Default.UserName;
 
       try {

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