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

Reduced duplicated code

Browse Source
This commit is contained in:
Scott Brady
2020-05-18 08:21:34 +01:00
parent c6210ba7f2
commit c92c633edb
55 changed files with 158 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.BackOffice/Extensions/UmbracoBackOfficeServiceCollectionExtensions.cs
View File

@@ -2,6 +2,7 @@
using System.Security.Claims;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Umbraco.Core;
using Umbraco.Core.BackOffice;
using Umbraco.Core.Mapping;
@@ -14,14 +15,17 @@ namespace Umbraco.Extensions
{
public static void AddUmbracoBackOfficeIdentity(this IServiceCollection services)
{
services.AddDataProtection();
// UmbracoMapper - hack?
services.AddSingleton<IdentityMapDefinition>();
services.AddSingleton(s => new MapDefinitionCollection(new[] {s.GetService<IdentityMapDefinition>()}));
services.AddSingleton<UmbracoMapper>();
services.TryAddSingleton<IdentityMapDefinition>();
services.TryAddSingleton(s => new MapDefinitionCollection(new[] {s.GetService<IdentityMapDefinition>()}));
services.TryAddSingleton<UmbracoMapper>();
services.AddScoped<IIpResolver, AspNetIpResolver>();
services.TryAddScoped<IIpResolver, AspNetIpResolver>();
services.AddIdentity<BackOfficeIdentityUser, IdentityRole>(options =>
services.AddIdentityCore<BackOfficeIdentityUser>();
services.AddIdentityCore<BackOfficeIdentityUser>(options =>
{
options.User.RequireUniqueEmail = true;
@@ -43,9 +47,12 @@ namespace Umbraco.Extensions
})
.AddDefaultTokenProviders()
.AddUserStore<BackOfficeUserStore>()
.AddUserManager<BackOfficeUserManager>();
.AddUserManager<BackOfficeUserManager>()
.AddClaimsPrincipalFactory<BackOfficeClaimsPrincipalFactory<BackOfficeIdentityUser>>();
services.AddScoped<ILookupNormalizer, NopLookupNormalizer>();
services.TryAddScoped<ISecurityStampValidator, SecurityStampValidator<BackOfficeIdentityUser>>();
// .AddClaimsPrincipalFactory<UserClaimsPrincipalFactory<BackOfficeIdentityUser, IdentityRole>>() // TODO: extract custom claims principal factory
}
}
}