yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Mole
2021-02-23 09:05:06 +01:00
parent 159747ab61
commit 20a70ec133
17 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
View File

@@ -1,8 +1,7 @@
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
namespace Umbraco.Core.Models.Mapping
namespace Umbraco.Cms.Core.Models.Mapping
{
/// <inheritdoc />
public class MemberMapDefinition : IMapDefinition

4
src/Umbraco.Infrastructure/Security/IMemberManager.cs
View File

@@ -1,6 +1,4 @@
using Umbraco.Core.Security;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
/// <summary>
/// The user manager for members

4
src/Umbraco.Infrastructure/Security/IdentityExtensions.cs
View File

@@ -1,9 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Identity;
namespace Umbraco.Core.Security
namespace Umbraco.Extensions
{
public static class IdentityExtensions
{

4
src/Umbraco.Infrastructure/Security/MemberRolesUserStore.cs
View File

@@ -5,10 +5,10 @@ using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Scoping;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
/// <summary>
/// A custom user store that uses Umbraco member data

2
src/Umbraco.Infrastructure/Security/MembersIdentityBuilder.cs
View File

@@ -3,7 +3,7 @@ using System.Reflection;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
public class MembersIdentityBuilder : IdentityBuilder
{

2
src/Umbraco.Infrastructure/Security/MembersIdentityOptions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
/// <summary>
/// Identity options specifically for the Umbraco members identity implementation

6
src/Umbraco.Infrastructure/Security/MembersIdentityUser.cs
View File

@@ -2,13 +2,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Identity;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models.Identity;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Core;
using Umbraco.Core.Models.Identity;
using Umbraco.Extensions;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
/// <summary>
/// The identity user used for the member

8
src/Umbraco.Infrastructure/Security/MembersUserStore.cs
View File

@@ -7,16 +7,14 @@ using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Identity;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Scoping;
using Umbraco.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Core.Security
namespace Umbraco.Cms.Core.Security
{
/// <summary>
/// A custom user store that uses Umbraco member data
@@ -525,7 +523,7 @@ namespace Umbraco.Core.Security
{
if (user != null)
{
//TODO: when to
//TODO: when to
//user.SetLoginsCallback(new Lazy<IEnumerable<IIdentityUserLogin>>(() => _externalLoginService.GetAll(UserIdToInt(user.Id))));
}

3
src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
@@ -12,7 +12,6 @@ using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Infrastructure.Persistence.Querying;
using Umbraco.Extensions;
using Umbraco.Core.Services.Implement;
namespace Umbraco.Cms.Infrastructure.Services.Implement
{

2
src/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs
View File

@@ -2,8 +2,8 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
using NUnit.Framework;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Tests.Integration.Testing;
using Umbraco.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Tests.Integration.Umbraco.Web.Common

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs
View File

@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Identity;
using NUnit.Framework;
using Umbraco.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice
{

6
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberIdentityUserManagerTests.cs
View File

@@ -11,8 +11,8 @@ using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Net;
using Umbraco.Core.Security;
using Umbraco.Web.Common.Security;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Web.Common.Security;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
{
@@ -53,7 +53,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
_mockPasswordConfiguration.Setup(x => x.Value).Returns(() =>
new MemberPasswordConfigurationSettings()
{
});
var pwdValidators = new List<PasswordValidator<MembersIdentityUser>>

6
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberIdentityUserStoreTests.cs
View File

@@ -8,12 +8,10 @@ using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
using Umbraco.Core.Models;
using Umbraco.Core.Scoping;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
{

10
src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
View File

@@ -26,13 +26,8 @@ using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Security;
using Umbraco.Core.Serialization;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Infrastructure.Serialization;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.UnitTests.AutoFixture;
using Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
@@ -40,6 +35,7 @@ using Umbraco.Cms.Web.BackOffice.Controllers;
using Umbraco.Cms.Web.BackOffice.Mapping;
using Umbraco.Cms.Web.Common.ActionsResults;
using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
using MemberMapDefinition = Umbraco.Cms.Web.BackOffice.Mapping.MemberMapDefinition;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
{
@@ -380,7 +376,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
var map = new MapDefinitionCollection(new List<IMapDefinition>()
{
new global::Umbraco.Core.Models.Mapping.MemberMapDefinition(),
new global::Umbraco.Cms.Core.Models.Mapping.MemberMapDefinition(),
memberMapDefinition,
new ContentTypeMapDefinition(
commonMapper,

4
src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs
View File

@@ -11,8 +11,8 @@ using SixLabors.ImageSharp.Web.DependencyInjection;
using SixLabors.ImageSharp.Web.Processors;
using SixLabors.ImageSharp.Web.Providers;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Core.Security;
using Umbraco.Web.Common.Security;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Web.Common.Security;
namespace Umbraco.Extensions
{

2
src/Umbraco.Web.Common/Extensions/IdentityBuilderExtensions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core.Security;
using Umbraco.Cms.Core.Security;
namespace Umbraco.Extensions
{

3
src/Umbraco.Web.Common/Security/MemberManager.cs
View File

@@ -10,11 +10,10 @@ using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Net;
using Umbraco.Cms.Core.Security;
using Umbraco.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Web.Common.Security
namespace Umbraco.Cms.Web.Common.Security
{
public class MemberManager : UmbracoUserManager<MembersIdentityUser, MemberPasswordConfigurationSettings>, IMemberManager
{