- Timestamp:
- 09/14/18 11:47:37 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Services.Access merged eligible /stable/HeuristicLab.Services.Access merged eligible /trunk/HeuristicLab.Services.Access merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.Access 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Services.Access 5516-5520 /branches/Async/HeuristicLab.Services.Access 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Services.Access 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Access 4656-4721 /branches/CodeEditor/HeuristicLab.Services.Access 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Access 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Access 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Access 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.Access 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.Access 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Access 5060 /branches/HLScript/HeuristicLab.Services.Access 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Access 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.Access 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Access 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Services.Access 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Services.Access 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.Access 10202-10483 /branches/NET40/sources/HeuristicLab.Services.Access 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.Access 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.Access 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Access 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Access 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Access 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Access 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Access 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Access 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.Access 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Access 5370-5682 /branches/Trunk/HeuristicLab.Services.Access 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Access 9168-9215 /branches/VNS/HeuristicLab.Services.Access 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.Access 12948-12950 /branches/histogram/HeuristicLab.Services.Access 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Services.Access 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/Interfaces/IRoleVerifier.cs
r16140 r16141 23 23 public interface IRoleVerifier { 24 24 bool IsInRole(string role); 25 bool IsUserInRole(string username, string role); 25 26 bool IsInAnyRole(params string[] roles); 26 27 bool IsInAllRoles(params string[] roles); -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/Interfaces/IUserManager.cs
r16140 r16141 31 31 MembershipUser GetUserById(Guid userId); 32 32 string GetUserNameById(Guid userId); 33 IEnumerable<Guid> GetUserGroupIdsOfUser(Guid userId); 33 34 bool VerifyUser(Guid userId, List<Guid> allowedUserGroups); 35 IEnumerable<DataTransfer.UserGroupMapping> GetUserGroupMapping(); 34 36 } 35 37 } -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/RoleVerifier.cs
r16140 r16141 29 29 return Roles.IsUserInRole(role); 30 30 } 31 public bool IsUserInRole(string username, string role) { 32 return Roles.IsUserInRole(username, role); 33 } 31 34 public bool IsInAnyRole(params string[] roles) { 32 35 return roles.Any(x => Roles.IsUserInRole(x)); -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/UserManager.cs
r16140 r16141 46 46 public string GetUserNameById(Guid userId) { 47 47 var user = GetUserById(userId); 48 if (user != null ) {48 if (user != null && !string.IsNullOrWhiteSpace(user.UserName)) { 49 49 return user.UserName; 50 50 } else { … … 52 52 } 53 53 54 } 55 56 public IEnumerable<Guid> GetUserGroupIdsOfUser(Guid userId) { 57 using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) { 58 var groupIds = from g in context.UserGroupUserGroups 59 where g.UserGroupId == userId 60 select g.UserGroupUserGroupId; 61 62 var query = from g in context.UserGroupBases.OfType<DA.UserGroup>() 63 where groupIds.Contains(g.Id) 64 select g.Id; 65 66 return query.ToList(); 67 } 54 68 } 55 69 … … 74 88 } 75 89 return false; 90 } 91 92 public IEnumerable<DataTransfer.UserGroupMapping> GetUserGroupMapping() { 93 using (DA.AccessServiceDataContext context = new DA.AccessServiceDataContext()) { 94 var query = from u in context.UserGroupUserGroups 95 select Convert.ToDto(u); 96 return query.ToList(); 97 } 76 98 } 77 99 -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/Web.config
r14748 r16141 2 2 <configuration> 3 3 <connectionStrings> 4 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />4 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 5 5 </connectionStrings> 6 6 … … 30 30 <host> 31 31 <baseAddresses> 32 <add baseAddress="http:// localhost:8000/AccessService-3.3/AccessService.svc" />32 <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" /> 33 33 </baseAddresses> 34 34 </host> … … 41 41 <serviceDebug includeExceptionDetailInFaults="true" /> 42 42 <serviceCredentials> 43 <serviceCertificate findValue=" localhost" x509FindType="FindBySubjectName" />43 <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" /> 44 44 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" 45 45 membershipProviderName="AspNetSqlMembershipProvider" /> -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access/3.3/app.config
r14748 r16141 2 2 <configuration> 3 3 <connectionStrings> 4 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />4 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 5 5 </connectionStrings> 6 6 … … 30 30 <host> 31 31 <baseAddresses> 32 <add baseAddress="http:// localhost:8000/AccessService-3.3/AccessService.svc" />32 <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" /> 33 33 </baseAddresses> 34 34 </host> … … 41 41 <serviceDebug includeExceptionDetailInFaults="true" /> 42 42 <serviceCredentials> 43 <serviceCertificate findValue=" localhost" x509FindType="FindBySubjectName" />43 <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" /> 44 44 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" 45 45 membershipProviderName="AspNetSqlMembershipProvider" />
Note: See TracChangeset
for help on using the changeset viewer.