Changeset 16139 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3

Timestamp:

09/13/18 13:18:45 (6 years ago)

Author:

ddorfmei

Message:

#2931: Merged [16046-16138/trunk] into branch

Location:

branches/2931_OR-Tools_LP_MIP

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Access (modified) (1 prop)
• HeuristicLab.Services.Access/3.3/Interfaces/IRoleVerifier.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/Interfaces/IUserManager.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/RoleVerifier.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/UserManager.cs (modified) (3 diffs)
• HeuristicLab.Services.Access/3.3/Web.config (modified) (3 diffs)
• HeuristicLab.Services.Access/3.3/app.config (modified) (3 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/Interfaces/IRoleVerifier.cs

@@ -23 +23 @@
   public interface IRoleVerifier {
     bool IsInRole(string role);
+    bool IsUserInRole(string username, string role);
     bool IsInAnyRole(params string[] roles);
     bool IsInAllRoles(params string[] roles);

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/Interfaces/IUserManager.cs

@@ -31 +31 @@
     MembershipUser GetUserById(Guid userId);
     string GetUserNameById(Guid userId);
+    IEnumerable<Guid> GetUserGroupIdsOfUser(Guid userId);
     bool VerifyUser(Guid userId, List<Guid> allowedUserGroups);
+    IEnumerable<DataTransfer.UserGroupMapping> GetUserGroupMapping();
   }
 }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/RoleVerifier.cs

@@ -29 +29 @@
       return Roles.IsUserInRole(role);
     }
+    public bool IsUserInRole(string username, string role) {
+      return Roles.IsUserInRole(username, role);
+    }
     public bool IsInAnyRole(params string[] roles) {
       return roles.Any(x => Roles.IsUserInRole(x));

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/UserManager.cs

@@ -46 +46 @@
     public string GetUserNameById(Guid userId) {
       var user = GetUserById(userId);
-      if (user != null) {
+      if (user != null && !string.IsNullOrWhiteSpace(user.UserName)) {
         return user.UserName;
       } else {
@@ -52 +52 @@
       }
 
+    }
+
+    public IEnumerable<Guid> GetUserGroupIdsOfUser(Guid userId) {
+      using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) {
+        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 g.Id;
+
+        return query.ToList();
+      }
     }
 
@@ -74 +88 @@
       }
       return false;
+    }
+
+    public IEnumerable<DataTransfer.UserGroupMapping> GetUserGroupMapping() {
+      using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) {
+        var query = from u in context.UserGroupUserGroups
+                    select Convert.ToDto(u);
+        return query.ToList();
+      }
     }
 

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/Web.config

@@ -2 +2 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
   </connectionStrings>
 
@@ -30 +30 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/AccessService-3.3/AccessService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" />
           </baseAddresses>
         </host>
@@ -41 +41 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />

branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.Access/3.3/app.config

@@ -2 +2 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
   </connectionStrings>
 
@@ -30 +30 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/AccessService-3.3/AccessService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" />
           </baseAddresses>
         </host>
@@ -41 +41 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />