From 6a48c1646d3ed3844bb70f96407c2fdad151bcff Mon Sep 17 00:00:00 2001 From: Claus Date: Thu, 13 Jul 2017 09:26:48 +0200 Subject: [PATCH] checking for uses of userType. --- .../Repositories/UserGroupRepository.cs | 2 +- .../Repositories/UserGroupRepositoryTest.cs | 22 ++++++++--------- .../Repositories/UserRepositoryTest.cs | 24 +++++++++---------- .../Providers/UsersMembershipProvider.cs | 4 ++-- .../members/UmbracoMembershipProvider.cs | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs index 7a160f7f24..02f62101ff 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs @@ -125,7 +125,7 @@ namespace Umbraco.Core.Persistence.Repositories repo.AssignPermission(groupId, permission, entityIds); } - #region Overrides of RepositoryBase + #region Overrides of RepositoryBase protected override IUserGroup PerformGet(int id) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs index 7bf29bb0ab..57d1f80995 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs @@ -64,18 +64,18 @@ namespace Umbraco.Tests.Persistence.Repositories using (var repository = CreateRepository(unitOfWork)) { - var userType1 = MockedUserGroup.CreateUserGroup("1"); - var userType2 = MockedUserGroup.CreateUserGroup("2"); + var userGroup1 = MockedUserGroup.CreateUserGroup("1"); + var userGroup2 = MockedUserGroup.CreateUserGroup("2"); // Act - repository.AddOrUpdate(userType1); + repository.AddOrUpdate(userGroup1); unitOfWork.Commit(); - repository.AddOrUpdate(userType2); + repository.AddOrUpdate(userGroup2); unitOfWork.Commit(); // Assert - Assert.That(userType1.HasIdentity, Is.True); - Assert.That(userType2.HasIdentity, Is.True); + Assert.That(userGroup1.HasIdentity, Is.True); + Assert.That(userGroup2.HasIdentity, Is.True); } } @@ -209,10 +209,10 @@ namespace Umbraco.Tests.Persistence.Repositories var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { - var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork); + var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork); // Act - var result = repository.GetAll(userTypes[0].Id, userTypes[1].Id); + var result = repository.GetAll(userGroups[0].Id, userGroups[1].Id); // Assert Assert.That(result, Is.Not.Null); @@ -249,10 +249,10 @@ namespace Umbraco.Tests.Persistence.Repositories var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { - var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork); + var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork); // Act - var exists = repository.Exists(userTypes[0].Id); + var exists = repository.Exists(userGroups[0].Id); // Assert Assert.That(exists, Is.True); @@ -267,7 +267,7 @@ namespace Umbraco.Tests.Persistence.Repositories var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { - var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork); + var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork); // Act var query = Query.Builder.Where(x => x.Alias == "testUserGroup1" || x.Alias == "testUserGroup2"); diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index 88ecb50f2f..334c4f98c2 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -36,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of(), SqlSyntax); var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of(), SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of()); return repository; - } + } private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository) { @@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence.Repositories contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, templateRepository); var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of()); return repository; - } + } private UserRepository CreateRepository(IScopeUnitOfWork unitOfWork) { @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Add_With_Group() { - var group = MockedUserGroup.CreateUserGroup(); + var group = MockedUserGroup.CreateUserGroup(); // Arrange var provider = new PetaPocoUnitOfWorkProvider(Logger); @@ -95,22 +95,22 @@ namespace Umbraco.Tests.Persistence.Repositories { repository.AddOrUpdate(group); unitOfWork.Commit(); - } + } using (var repository = CreateRepository(unitOfWork)) { IUser user = MockedUser.CreateUser(); - user.AddGroup(group.ToReadOnlyGroup()); + user.AddGroup(group.ToReadOnlyGroup()); // Act repository.AddOrUpdate(user); unitOfWork.Commit(); - user = repository.Get(user.Id); + user = repository.Get(user.Id); // Assert Assert.That(user.HasIdentity, Is.True); - Assert.AreEqual(1, user.Groups.Count()); + Assert.AreEqual(1, user.Groups.Count()); Assert.AreEqual(group.Alias, user.Groups.ElementAt(0).Alias); } } @@ -165,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories var ct = MockedContentTypes.CreateBasicContentType("test"); var content = MockedContent.CreateBasicContent(ct); var mt = MockedContentTypes.CreateSimpleMediaType("testmedia", "TestMedia"); - var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1); + var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1); // Arrange var provider = new PetaPocoUnitOfWorkProvider(Logger); @@ -173,8 +173,8 @@ namespace Umbraco.Tests.Persistence.Repositories IContentTypeRepository contentTypeRepo; IMediaTypeRepository mediaTypeRepo; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepo)) - using (var mediaRepository = CreateMediaRepository(unitOfWork, out mediaTypeRepo)) - using (contentTypeRepo) + using (var mediaRepository = CreateMediaRepository(unitOfWork, out mediaTypeRepo)) + using (contentTypeRepo) using(mediaTypeRepo) using (var userRepository = CreateRepository(unitOfWork)) using (var userGroupRepository = CreateUserGroupRepository(unitOfWork)) @@ -185,7 +185,7 @@ namespace Umbraco.Tests.Persistence.Repositories contentRepository.AddOrUpdate(content); mediaRepository.AddOrUpdate(media); - unitOfWork.Commit(); + unitOfWork.Commit(); var user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository, unitOfWork); @@ -422,7 +422,7 @@ namespace Umbraco.Tests.Persistence.Repositories var group = MockedUserGroup.CreateUserGroup(); userGroupRepository.AddOrUpdateGroupWithUsers(@group, new[] {user.Id}); - unitOfWork.Commit(); + unitOfWork.Commit(); return user; } diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs index cd19d36f2d..7034101a83 100644 --- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs @@ -46,8 +46,8 @@ namespace Umbraco.Web.Security.Providers { base.Initialize(name, config); - // test for membertype (if not specified, choose the first member type available) - // We'll support both names for legacy reasons: defaultUserTypeAlias & defaultUserGroupAlias + // test for membertype (if not specified, choose the first member type available) + // We'll support both names for legacy reasons: defaultUserTypeAlias & defaultUserGroupAlias if (config["defaultUserTypeAlias"] != null) { diff --git a/src/umbraco.providers/members/UmbracoMembershipProvider.cs b/src/umbraco.providers/members/UmbracoMembershipProvider.cs index 2a563d27ce..648bf5a0d5 100644 --- a/src/umbraco.providers/members/UmbracoMembershipProvider.cs +++ b/src/umbraco.providers/members/UmbracoMembershipProvider.cs @@ -126,7 +126,7 @@ namespace umbraco.providers.members _defaultMemberTypeAlias = config["defaultMemberTypeAlias"]; if (_defaultMemberTypeAlias.IsNullOrWhiteSpace()) { - throw new ProviderException("No default user group alias is specified in the web.config string. Please add a 'defaultUserTypeAlias' to the add element in the provider declaration in web.config"); + throw new ProviderException("No default MemberType alias is specified in the web.config string. Please add a 'defaultMemberTypeAlias' to the add element in the provider declaration in web.config"); } _hasDefaultMember = true; }