2021-02-14 13:01:27 +00:00
|
|
|
using Microsoft.AspNetCore.Identity;
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
using Umbraco.Cms.Core.DependencyInjection;
|
2021-02-23 09:05:06 +01:00
|
|
|
using Umbraco.Cms.Core.Security;
|
2022-01-21 13:10:34 +01:00
|
|
|
using Umbraco.Cms.Infrastructure.Security;
|
2021-02-14 13:01:27 +00:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
namespace Umbraco.Extensions;
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Extension methods for <see cref="IdentityBuilder" />
|
|
|
|
|
/// </summary>
|
|
|
|
|
public static class IdentityBuilderExtensions
|
2021-02-14 13:01:27 +00:00
|
|
|
{
|
|
|
|
|
/// <summary>
|
2022-05-09 09:39:46 +02:00
|
|
|
/// Adds a <see cref="UserManager{TUser}" /> for the <seealso cref="MemberIdentityUser" />.
|
2021-02-14 13:01:27 +00:00
|
|
|
/// </summary>
|
2022-05-09 09:39:46 +02:00
|
|
|
/// <typeparam name="TInterface">The member manager interface</typeparam>
|
|
|
|
|
/// <typeparam name="TUserManager">The member manager type</typeparam>
|
|
|
|
|
/// <returns>The current <see cref="IdentityBuilder" /> instance.</returns>
|
|
|
|
|
public static IdentityBuilder AddMemberManager<TInterface, TUserManager>(this IdentityBuilder identityBuilder)
|
|
|
|
|
where TUserManager : UserManager<MemberIdentityUser>, TInterface
|
|
|
|
|
where TInterface : notnull
|
2021-02-14 13:01:27 +00:00
|
|
|
{
|
2022-05-09 09:39:46 +02:00
|
|
|
identityBuilder.AddUserManager<TUserManager>();
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
// use a UniqueServiceDescriptor so we can check if it's already been added
|
|
|
|
|
var memberManagerDescriptor =
|
|
|
|
|
new UniqueServiceDescriptor(typeof(TInterface), typeof(TUserManager), ServiceLifetime.Scoped);
|
|
|
|
|
identityBuilder.Services.Add(memberManagerDescriptor);
|
|
|
|
|
identityBuilder.Services.AddScoped(
|
|
|
|
|
typeof(UserManager<MemberIdentityUser>),
|
|
|
|
|
factory => factory.GetRequiredService<TInterface>());
|
|
|
|
|
return identityBuilder;
|
|
|
|
|
}
|
2021-04-09 15:24:12 +10:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
public static IdentityBuilder AddRoleManager<TInterface, TRoleManager>(this IdentityBuilder identityBuilder)
|
|
|
|
|
where TRoleManager : RoleManager<UmbracoIdentityRole>, TInterface
|
|
|
|
|
where TInterface : notnull
|
|
|
|
|
{
|
|
|
|
|
identityBuilder.AddRoleManager<TRoleManager>();
|
|
|
|
|
identityBuilder.Services.AddScoped(typeof(TInterface), typeof(TRoleManager));
|
|
|
|
|
identityBuilder.Services.AddScoped(
|
|
|
|
|
typeof(RoleManager<MemberIdentityUser>),
|
|
|
|
|
factory => factory.GetRequiredService<TInterface>());
|
|
|
|
|
return identityBuilder;
|
|
|
|
|
}
|
2022-01-19 09:21:50 +01:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
/// <summary>
|
|
|
|
|
/// Adds a <see cref="SignInManager{TUser}" /> implementation for <seealso cref="MemberIdentityUser" />
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <typeparam name="TInterface">The sign in manager interface</typeparam>
|
|
|
|
|
/// <typeparam name="TSignInManager">The sign in manager type</typeparam>
|
|
|
|
|
/// <param name="identityBuilder">The <see cref="IdentityBuilder" /></param>
|
|
|
|
|
/// <returns>The current <see cref="IdentityBuilder" /> instance.</returns>
|
|
|
|
|
public static IdentityBuilder AddSignInManager<TInterface, TSignInManager>(this IdentityBuilder identityBuilder)
|
|
|
|
|
where TSignInManager : SignInManager<MemberIdentityUser>, TInterface
|
|
|
|
|
{
|
|
|
|
|
identityBuilder.AddSignInManager<TSignInManager>();
|
|
|
|
|
identityBuilder.Services.AddScoped(typeof(TInterface), typeof(TSignInManager));
|
|
|
|
|
return identityBuilder;
|
|
|
|
|
}
|
2022-01-19 09:21:50 +01:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
public static IdentityBuilder AddUserStore<TInterface, TStore>(
|
|
|
|
|
this IdentityBuilder identityBuilder,
|
|
|
|
|
Func<IServiceProvider, TStore> implementationFactory)
|
|
|
|
|
where TStore : class, TInterface
|
|
|
|
|
{
|
|
|
|
|
identityBuilder.Services.AddScoped(typeof(TInterface), implementationFactory);
|
|
|
|
|
return identityBuilder;
|
|
|
|
|
}
|
2022-01-21 13:10:34 +01:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
public static MemberIdentityBuilder AddTwoFactorProvider<T>(
|
|
|
|
|
this MemberIdentityBuilder identityBuilder,
|
|
|
|
|
string providerName)
|
|
|
|
|
where T : class, ITwoFactorProvider
|
|
|
|
|
{
|
|
|
|
|
identityBuilder.Services.AddSingleton<ITwoFactorProvider, T>();
|
|
|
|
|
identityBuilder.Services.AddSingleton<T>();
|
|
|
|
|
identityBuilder.AddTokenProvider<TwoFactorMemberValidationProvider<T>>(providerName);
|
2022-01-21 13:10:34 +01:00
|
|
|
|
2022-05-09 09:39:46 +02:00
|
|
|
return identityBuilder;
|
2021-02-14 13:01:27 +00:00
|
|
|
}
|
|
|
|
|
}
|