Changeset 6810
- Timestamp:
- 09/20/11 17:53:27 (13 years ago)
- Location:
- branches/ClientUserManagement
- Files:
-
- 26 added
- 8 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/ClientUserManagement/HeuristicLab.ClientUserManagement.sln
r6800 r6810 9 9 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.ClientManagement.DataAccess", "HeuristicLab.Services.ClientManagement.DataAccess\3.3\HeuristicLab.Services.ClientManagement.DataAccess.csproj", "{5C6595CF-436E-4C45-9B6C-FC3948A6E117}" 10 10 EndProject 11 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.UserManagement", "HeuristicLab.Services.UserManagement\3.3\HeuristicLab.Services.UserManagement.csproj", "{7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}" 12 EndProject 13 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.UserManagement.DataAccess", "HeuristicLab.Services.UserManagement.DataAccess\3.3\HeuristicLab.Services.UserManagement.DataAccess.csproj", "{AB586CCE-F953-458F-9061-8E4B83FC90D6}" 14 EndProject 11 15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.ClientManagement", "HeuristicLab.Services.ClientManagement\3.3\HeuristicLab.Services.ClientManagement.csproj", "{63D4C87A-030B-4578-8E9E-DAE6F3E39C90}" 12 16 EndProject 13 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab. Services.UserManagement", "HeuristicLab.Services.UserManagement\3.3\HeuristicLab.Services.UserManagement.csproj", "{7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}"17 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.UserManagement", "HeuristicLab.Clients.UserManagement\3.3\HeuristicLab.Clients.UserManagement.csproj", "{494F87F4-0F25-4D33-A382-10CDB2174D48}" 14 18 EndProject 15 19 Global 16 20 GlobalSection(SolutionConfigurationPlatforms) = preSolution 17 21 Debug|Any CPU = Debug|Any CPU 22 Debug|Mixed Platforms = Debug|Mixed Platforms 23 Debug|x86 = Debug|x86 18 24 Release|Any CPU = Release|Any CPU 25 Release|Mixed Platforms = Release|Mixed Platforms 26 Release|x86 = Release|x86 19 27 EndGlobalSection 20 28 GlobalSection(ProjectConfigurationPlatforms) = postSolution 21 29 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 22 30 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Debug|Any CPU.Build.0 = Debug|Any CPU 31 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 32 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 33 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Debug|x86.ActiveCfg = Debug|Any CPU 23 34 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Release|Any CPU.ActiveCfg = Release|Any CPU 24 35 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Release|Any CPU.Build.0 = Release|Any CPU 36 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 37 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Release|Mixed Platforms.Build.0 = Release|Any CPU 38 {5C6595CF-436E-4C45-9B6C-FC3948A6E117}.Release|x86.ActiveCfg = Release|Any CPU 39 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 40 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Any CPU.Build.0 = Debug|Any CPU 41 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 42 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 43 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|x86.ActiveCfg = Debug|Any CPU 44 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Any CPU.ActiveCfg = Release|Any CPU 45 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Any CPU.Build.0 = Release|Any CPU 46 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 47 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Mixed Platforms.Build.0 = Release|Any CPU 48 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|x86.ActiveCfg = Release|Any CPU 49 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 50 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Debug|Any CPU.Build.0 = Debug|Any CPU 51 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 52 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 53 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Debug|x86.ActiveCfg = Debug|Any CPU 54 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Release|Any CPU.Build.0 = Release|Any CPU 56 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 57 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU 58 {AB586CCE-F953-458F-9061-8E4B83FC90D6}.Release|x86.ActiveCfg = Release|Any CPU 25 59 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 26 60 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Debug|Any CPU.Build.0 = Debug|Any CPU 61 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 62 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 63 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Debug|x86.ActiveCfg = Debug|Any CPU 27 64 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Release|Any CPU.ActiveCfg = Release|Any CPU 28 65 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Release|Any CPU.Build.0 = Release|Any CPU 29 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 30 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Debug|Any CPU.Build.0 = Debug|Any CPU 31 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Any CPU.ActiveCfg = Release|Any CPU 32 {7FAF6FD7-F5C4-42AA-BA32-E89B563BDF60}.Release|Any CPU.Build.0 = Release|Any CPU 66 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 67 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Release|Mixed Platforms.Build.0 = Release|Any CPU 68 {63D4C87A-030B-4578-8E9E-DAE6F3E39C90}.Release|x86.ActiveCfg = Release|Any CPU 69 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 70 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Debug|Any CPU.Build.0 = Debug|Any CPU 71 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 72 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 73 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Debug|x86.ActiveCfg = Debug|Any CPU 74 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Release|Any CPU.Build.0 = Release|Any CPU 76 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 77 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Release|Mixed Platforms.Build.0 = Release|Any CPU 78 {494F87F4-0F25-4D33-A382-10CDB2174D48}.Release|x86.ActiveCfg = Release|Any CPU 33 79 EndGlobalSection 34 80 GlobalSection(SolutionProperties) = preSolution -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3
- Property svn:ignore
-
old new 1 HeuristicLab.Services.UserManagement.csproj.user 1 2 bin 2 3 obj
-
- Property svn:ignore
-
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/DataTransfer/Role.cs
r6800 r6810 20 20 #endregion 21 21 22 using System;23 22 using System.Runtime.Serialization; 24 23 … … 27 26 [DataContract] 28 27 public class Role : UserManagementItem { 28 29 29 [DataMember] 30 public Guid ApplicationId { get; set; } 30 public string RoleName { get; set; } 31 32 [DataMember] 33 public Application App { get; set; } 31 34 } 32 35 } -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/DataTransfer/User.cs
r6800 r6810 27 27 public class User : UserManagementItem { 28 28 [DataMember] 29 public Guid ApplicationId{ get; set; }29 public string Comment { get; set; } 30 30 31 31 [DataMember] 32 32 public string Email { get; set; } 33 34 [DataMember] 35 public DateTime CreationDate { get; set; } 36 37 [DataMember] 38 public DateTime LastLoginDate { get; set; } 39 40 [DataMember] 41 public DateTime LastPasswordChangedDate { get; set; } 42 43 [DataMember] 44 public DateTime LastLockoutDate { get; set; } 33 45 34 46 [DataMember] … … 39 51 40 52 [DataMember] 41 public DateTime CreateDate { get; set; } 42 43 [DataMember] 44 public DateTime LastLoginDate { get; set; } 45 46 [DataMember] 47 public DateTime LastPasswordChangeDate { get; set; } 48 49 [DataMember] 50 public DateTime LastLockoutDate { get; set; } 53 public bool IsOnline { get; set; } 51 54 52 55 [DataMember] 53 56 public DateTime LastActivityDate { get; set; } 57 58 [DataMember] 59 public string PasswordQuestion { get; set; } 60 61 [DataMember] 62 public string ProviderName { get; set; } 63 64 [DataMember] 65 public object ProviderUserKey { get; set; } 66 67 [DataMember] 68 public string UserName { get; set; } 69 70 [DataMember] 71 public Application App { get; set; } 54 72 } 55 73 } -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/DataTransfer/UserManagementItem.cs
r6800 r6810 20 20 #endregion 21 21 22 using System;23 22 using System.Runtime.Serialization; 24 23 … … 26 25 [DataContract] 27 26 public class UserManagementItem { 28 [DataMember]29 public Guid Id { get; set; }30 27 31 [DataMember]32 public string Name { get; set; }33 28 34 [DataMember] 35 public string Description { get; set; } 29 36 30 } 37 31 } -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/HeuristicLab.Services.UserManagement.csproj
r6800 r6810 11 11 <RootNamespace>HeuristicLab.Services.UserManagement</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Services.UserManagement</AssemblyName> 13 <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> 13 14 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 14 15 <FileAlignment>512</FileAlignment> … … 42 43 <Reference Include="System.Runtime.Serialization" /> 43 44 <Reference Include="System.ServiceModel" /> 45 <Reference Include="System.Web" /> 46 <Reference Include="System.Web.ApplicationServices" /> 44 47 <Reference Include="System.Xml.Linq" /> 45 48 <Reference Include="System.Data.DataSetExtensions" /> … … 49 52 </ItemGroup> 50 53 <ItemGroup> 54 <Compile Include="Convert.cs" /> 55 <Compile Include="DataTransfer\Application.cs" /> 56 <Compile Include="DataTransfer\Membership.cs" /> 57 <Compile Include="UserManagementService.cs" /> 51 58 <Compile Include="DataTransfer\Role.cs" /> 52 59 <Compile Include="DataTransfer\User.cs" /> … … 54 61 <Compile Include="IUserManagementService.cs" /> 55 62 <Compile Include="Properties\AssemblyInfo.cs" /> 63 <None Include="app.config" /> 56 64 <None Include="HeuristicLab.snk" /> 57 65 <None Include="Properties\AssemblyInfo.frame" /> 58 66 </ItemGroup> 59 <ItemGroup /> 67 <ItemGroup> 68 <ProjectReference Include="..\..\HeuristicLab.Services.UserManagement.DataAccess\3.3\HeuristicLab.Services.UserManagement.DataAccess.csproj"> 69 <Project>{AB586CCE-F953-458F-9061-8E4B83FC90D6}</Project> 70 <Name>HeuristicLab.Services.UserManagement.DataAccess</Name> 71 </ProjectReference> 72 </ItemGroup> 60 73 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 74 <ProjectExtensions> 75 <VisualStudio> 76 <FlavorProperties GUID="{3D9AD99F-2412-4246-B90B-4EAA41C64699}"> 77 <WcfProjectProperties> 78 <AutoStart>False</AutoStart> 79 </WcfProjectProperties> 80 </FlavorProperties> 81 </VisualStudio> 82 </ProjectExtensions> 61 83 <PropertyGroup> 62 84 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir) -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/IUserManagementService.cs
r6800 r6810 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Net.Security; … … 29 28 [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)] 30 29 public interface IUserManagementService { 30 31 31 #region User 32 32 [OperationContract] 33 User GetUser(Guid id);33 IEnumerable<User> GetUsers(Application application); 34 34 35 35 [OperationContract] 36 IEnumerable<User> GetUsers();36 User AddUser(User user); 37 37 38 38 [OperationContract] 39 IEnumerable<User> GetUsersForApplication(Guid applicationId); 40 41 [OperationContract] 42 Guid AddUser(User user); 43 44 [OperationContract] 45 void DeleteUser(Guid id); 39 void DeleteUser(User user); 46 40 47 41 [OperationContract] … … 49 43 50 44 [OperationContract] 51 void SetRoleForUser(Guid roleId, Guid userId);45 void AddUserToRole(Role role, User user); 52 46 53 47 [OperationContract] 54 IEnumerable<User> GetUsersWithRole(Guid roleId);48 void RemoveUserFromRole(Role role, User user); 55 49 56 50 [OperationContract] 57 void RemoveRoleFromUser(Guid roleId, Guid userId); 58 59 [OperationContract] 60 bool HasUserRole(Guid userId, Guid roleId); 51 bool IsUserInRole(User user, Role role); 61 52 62 53 [OperationContract] … … 66 57 #region Role 67 58 [OperationContract] 68 Role GetRole(Guid id);59 IEnumerable<Role> GetRoles(Application application); 69 60 70 61 [OperationContract] 71 IEnumerable<Role> GetRoles(); 72 73 [OperationContract] 74 IEnumerable<Role> GetRolesForApplication(Guid applicationId); 75 76 [OperationContract] 77 Guid AddRole(Role role); 62 Role AddRole(Role role); 78 63 79 64 [OperationContract] … … 81 66 82 67 [OperationContract] 83 void DeleteRole( Guid id);68 void DeleteRole(Role role); 84 69 85 70 [OperationContract] 86 IEnumerable<Role> GetUserRoles(Guid userId); 71 IEnumerable<Role> GetUserRoles(User user); 72 #endregion 73 74 #region Application 75 [OperationContract] 76 IEnumerable<Application> GetApplications(); 77 78 [OperationContract] 79 IEnumerable<User> GetApplicationUsers(Application application); 80 81 [OperationContract] 82 Application AddApplication(Application application); 83 84 [OperationContract] 85 void UpdateApplication(Application application); 86 87 [OperationContract] 88 void DeleteApplication(Application application); 89 #endregion 90 91 #region Client specific methods 92 [OperationContract] 93 bool CheckUserExists(string application, string userName, string password); 94 95 [OperationContract] 96 bool GetUser(string application, string userName, string password); 87 97 #endregion 88 98 } -
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/Properties
-
Property
svn:ignore
set to
AssemblyInfo.cs
-
Property
svn:ignore
set to
-
branches/ClientUserManagement/HeuristicLab.Services.UserManagement/3.3/UserManagementService.cs
r6800 r6810 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Net.Security;25 22 using System.ServiceModel; 26 using HeuristicLab.Services.UserManagement.DataTransfer;27 23 28 24 namespace HeuristicLab.Services.UserManagement { 29 [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)] 30 public interface IUserManagementService { 31 #region User 32 [OperationContract] 33 User GetUser(Guid id); 25 [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall)] 26 public class UserManagementService : IUserManagementService { 34 27 35 [OperationContract] 36 IEnumerable<User> GetUsers(); 28 #region IUserManagementService Members 37 29 38 [OperationContract] 39 IEnumerable<User> GetUsersForApplication(Guid applicationId); 30 public System.Collections.Generic.IEnumerable<DataTransfer.User> GetUsers(DataTransfer.Application application) { 31 throw new System.NotImplementedException(); 32 } 40 33 41 [OperationContract] 42 Guid AddUser(User user); 34 public DataTransfer.User AddUser(DataTransfer.User user) { 35 throw new System.NotImplementedException(); 36 } 43 37 44 [OperationContract] 45 void DeleteUser(Guid id); 38 public void DeleteUser(DataTransfer.User user) { 39 throw new System.NotImplementedException(); 40 } 46 41 47 [OperationContract] 48 void UpdateUser(User user); 42 public void UpdateUser(DataTransfer.User user) { 43 throw new System.NotImplementedException(); 44 } 49 45 50 [OperationContract] 51 void SetRoleForUser(Guid roleId, Guid userId); 46 public void AddUserToRole(DataTransfer.Role role, DataTransfer.User user) { 47 throw new System.NotImplementedException(); 48 } 52 49 53 [OperationContract] 54 IEnumerable<User> GetUsersWithRole(Guid roleId); 50 public void RemoveUserFromRole(DataTransfer.Role role, DataTransfer.User user) { 51 throw new System.NotImplementedException(); 52 } 55 53 56 [OperationContract] 57 void RemoveRoleFromUser(Guid roleId, Guid userId); 54 public bool IsUserInRole(DataTransfer.User user, DataTransfer.Role role) { 55 throw new System.NotImplementedException(); 56 } 58 57 59 [OperationContract] 60 bool HasUserRole(Guid userId, Guid roleId); 58 public DataTransfer.User ResetPassword(string applicationName, string userName, string password) { 59 throw new System.NotImplementedException(); 60 } 61 61 62 [OperationContract]63 User ResetPassword(string applicationName, string userName, string password);64 #endregion62 public System.Collections.Generic.IEnumerable<DataTransfer.Role> GetRoles(DataTransfer.Application application) { 63 throw new System.NotImplementedException(); 64 } 65 65 66 #region Role67 [OperationContract]68 Role GetRole(Guid id);66 public DataTransfer.Role AddRole(DataTransfer.Role role) { 67 throw new System.NotImplementedException(); 68 } 69 69 70 [OperationContract] 71 IEnumerable<Role> GetRoles(); 70 public void UpdateRole(DataTransfer.Role role) { 71 throw new System.NotImplementedException(); 72 } 72 73 73 [OperationContract] 74 IEnumerable<Role> GetRolesForApplication(Guid applicationId); 74 public void DeleteRole(DataTransfer.Role role) { 75 throw new System.NotImplementedException(); 76 } 75 77 76 [OperationContract] 77 Guid AddRole(Role role); 78 public System.Collections.Generic.IEnumerable<DataTransfer.Role> GetUserRoles(DataTransfer.User user) { 79 throw new System.NotImplementedException(); 80 } 78 81 79 [OperationContract] 80 void UpdateRole(Role role); 82 public System.Collections.Generic.IEnumerable<DataTransfer.Application> GetApplications() { 83 throw new System.NotImplementedException(); 84 } 81 85 82 [OperationContract] 83 void DeleteRole(Guid id); 86 public System.Collections.Generic.IEnumerable<DataTransfer.User> GetApplicationUsers(DataTransfer.Application application) { 87 throw new System.NotImplementedException(); 88 } 84 89 85 [OperationContract] 86 IEnumerable<Role> GetUserRoles(Guid userId); 90 public DataTransfer.Application AddApplication(DataTransfer.Application application) { 91 throw new System.NotImplementedException(); 92 } 93 94 public void UpdateApplication(DataTransfer.Application application) { 95 throw new System.NotImplementedException(); 96 } 97 98 public void DeleteApplication(DataTransfer.Application application) { 99 throw new System.NotImplementedException(); 100 } 101 102 public bool CheckUserExists(string application, string userName, string password) { 103 throw new System.NotImplementedException(); 104 } 105 106 public bool GetUser(string application, string userName, string password) { 107 throw new System.NotImplementedException(); 108 } 109 87 110 #endregion 88 111 }
Note: See TracChangeset
for help on using the changeset viewer.