- Timestamp:
- 03/13/12 17:28:04 (12 years ago)
- Location:
- branches/ClientUserManagement/HeuristicLab.Services.Access/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs
r7611 r7612 36 36 private IUserManager UserManager { 37 37 get { 38 if (userManager == null) userManager = new UserManager();38 if (userManager == null) userManager = AccessServiceLocator.Instance.UserManager; 39 39 return userManager; 40 40 } … … 44 44 private IRoleVerifier RoleVerifier { 45 45 get { 46 if (roleVerifier == null) roleVerifier = new RoleVerifier();46 if (roleVerifier == null) roleVerifier = AccessServiceLocator.Instance.RoleVerifier; 47 47 return roleVerifier; 48 48 } … … 143 143 144 144 public void DeleteClient(DT.Client client) { 145 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 146 145 147 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 146 148 //load client because we could get a detached object … … 198 200 199 201 public void DeleteClientGroup(DT.ClientGroup clientGroup) { 202 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 203 200 204 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 201 205 //load clientGroup because we could get a detached object … … 289 293 290 294 public void DeleteClientLog(DT.ClientLog log) { 295 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 296 291 297 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 292 298 context.ClientLogs.DeleteOnSubmit(Convert.ToEntity(log)); … … 484 490 485 491 public DT.User AddUser(DT.User user) { 492 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 493 486 494 DA.User accessUser; 487 495 DA.aspnet_User aspUser; … … 529 537 530 538 public void DeleteUser(DT.User user) { 539 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 540 531 541 if (user.Id != null && user.Id != Guid.Empty) { 532 542 //delete asp.net user … … 551 561 552 562 public void UpdateUser(DT.User user) { 563 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 564 553 565 AddUser(user); 554 566 } 555 567 556 568 public void AddUserToRole(DT.Role role, DT.User user) { 569 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 570 557 571 //TODO: usernames and rolenames have to be unique! 558 572 MembershipUser msUser = Membership.GetUser((object)user.Id); … … 563 577 564 578 public void RemoveUserFromRole(DT.Role role, DT.User user) { 579 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 580 565 581 MembershipUser msUser = Membership.GetUser((object)user.Id); 566 582 if (msUser != null) { … … 569 585 } 570 586 571 public bool ResetPassword(Guid userId, string oldPassword, string newPassword) {587 public bool ChangePassword(Guid userId, string oldPassword, string newPassword) { 572 588 MembershipUser msUser = Membership.GetUser(userId); 573 589 if (msUser != null) { … … 575 591 } 576 592 return false; 593 } 594 595 public string ResetPassword(Guid userId) { 596 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 597 598 MembershipUser msUser = Membership.GetUser(userId); 599 if (msUser != null) { 600 return msUser.ResetPassword(); 601 } else { 602 throw new Exception("Password reset failed."); 603 } 577 604 } 578 605 #endregion … … 626 653 627 654 public void DeleteUserGroup(DT.UserGroup group) { 655 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 656 628 657 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 629 658 context.UserGroupBases.DeleteOnSubmit(Convert.ToEntity(group)); … … 733 762 734 763 public DT.Role AddRole(DT.Role role) { 764 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 765 735 766 Roles.CreateRole(role.Name); 736 767 return role; … … 738 769 739 770 public void DeleteRole(DT.Role role) { 771 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 772 740 773 Roles.DeleteRole(role.Name); 741 774 } … … 767 800 768 801 public void RemoveRoleFromGroup(DT.UserGroup userGroup, DT.Role role) { 802 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 803 769 804 Guid[] userIds; 770 805 string[] aspUsers; … … 795 830 796 831 public IEnumerable<DT.ClientError> GetClientErrors() { 832 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 833 797 834 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 798 835 var query = from c in context.ClientErrors … … 803 840 804 841 public IEnumerable<DT.ClientError> GetLastClientErrors(DateTime startDate) { 842 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 843 805 844 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 806 845 var query = from c in context.ClientErrors … … 812 851 813 852 public void DeleteError(DT.ClientError error) { 853 roleVerifier.AuthenticateForAllRoles(AccessServiceRoles.Administrator); 854 814 855 using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) { 815 856 var query = context.ClientErrors.Where(x => x.Id == error.Id); -
branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/IAccessService.cs
r7611 r7612 104 104 105 105 #region User 106 //TODO: i don't think this method is needed107 106 [OperationContract] 108 107 LightweightUser Login(); … … 142 141 143 142 [OperationContract] 144 bool ResetPassword(Guid userId, string oldPassword, string newPassword); 143 bool ChangePassword(Guid userId, string oldPassword, string newPassword); 144 145 [OperationContract] 146 string ResetPassword(Guid userId); 145 147 #endregion 146 148
Note: See TracChangeset
for help on using the changeset viewer.