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

Merged IMemberSignInManagerExternalLogins into IMemberSignInManager

Browse Source
This commit is contained in:
Bjarke Berg
2022-05-02 12:32:25 +02:00
parent 46373ebfb0
commit 4bc5d31dfe
6 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilder.MembersIdentity.cs
View File

@@ -58,7 +58,6 @@ namespace Umbraco.Extensions
.AddRoleManager<IMemberRoleManager, MemberRoleManager>()
.AddMemberManager<IMemberManager, MemberManager>()
.AddSignInManager<IMemberSignInManager, MemberSignInManager>()
.AddSignInManager<IMemberSignInManagerExternalLogins, MemberSignInManager>()
.AddErrorDescriber<MembersErrorDescriber>()
.AddUserConfirmation<UmbracoUserConfirmation<MemberIdentityUser>>();

8
src/Umbraco.Web.Common/Security/IMemberSignInManager.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Identity;
using Umbraco.Cms.Core.Security;
@@ -11,5 +12,12 @@ namespace Umbraco.Cms.Web.Common.Security
Task<SignInResult> PasswordSignInAsync(string userName, string password, bool isPersistent, bool lockoutOnFailure);
Task SignInAsync(MemberIdentityUser user, bool isPersistent, string? authenticationMethod = null);
Task SignOutAsync();
AuthenticationProperties ConfigureExternalAuthenticationProperties(string provider, string redirectUrl, string? userId = null);
Task<ExternalLoginInfo?> GetExternalLoginInfoAsync(string? expectedXsrf = null);
Task<IdentityResult> UpdateExternalAuthenticationTokensAsync(ExternalLoginInfo externalLogin);
Task<SignInResult> ExternalLoginSignInAsync(ExternalLoginInfo loginInfo, bool isPersistent, bool bypassTwoFactor = false);
Task<MemberIdentityUser> GetTwoFactorAuthenticationUserAsync();
Task<SignInResult> TwoFactorSignInAsync(string? provider, string? code, bool isPersistent, bool rememberClient);
}
}

19
src/Umbraco.Web.Common/Security/IMemberSignInManagerExternalLogins.cs
View File

@@ -1,19 +0,0 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Identity;
using Umbraco.Cms.Core.Security;
namespace Umbraco.Cms.Web.Common.Security
{
[Obsolete("This interface will be merged with IMemberSignInManager in Umbraco 10")]
public interface IMemberSignInManagerExternalLogins : IMemberSignInManager
{
AuthenticationProperties ConfigureExternalAuthenticationProperties(string provider, string redirectUrl, string? userId = null);
Task<ExternalLoginInfo?> GetExternalLoginInfoAsync(string? expectedXsrf = null);
Task<IdentityResult> UpdateExternalAuthenticationTokensAsync(ExternalLoginInfo externalLogin);
Task<SignInResult> ExternalLoginSignInAsync(ExternalLoginInfo loginInfo, bool isPersistent, bool bypassTwoFactor = false);
Task<MemberIdentityUser> GetTwoFactorAuthenticationUserAsync();
Task<SignInResult> TwoFactorSignInAsync(string? provider, string? code, bool isPersistent, bool rememberClient);
}
}

2
src/Umbraco.Web.Common/Security/MemberSignInManager.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Cms.Web.Common.Security
/// <summary>
/// The sign in manager for members
/// </summary>
public class MemberSignInManager : UmbracoSignInManager<MemberIdentityUser>, IMemberSignInManagerExternalLogins
public class MemberSignInManager : UmbracoSignInManager<MemberIdentityUser>, IMemberSignInManager
{
private readonly IMemberExternalLoginProviders _memberExternalLoginProviders;
private readonly IEventAggregator _eventAggregator;

4
src/Umbraco.Web.Website/Controllers/UmbExternalLoginController.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Cms.Web.Website.Controllers
private readonly ITwoFactorLoginService _twoFactorLoginService;
private readonly IOptions<SecuritySettings> _securitySettings;
private readonly ILogger<UmbExternalLoginController> _logger;
private readonly IMemberSignInManagerExternalLogins _memberSignInManager;
private readonly IMemberSignInManager _memberSignInManager;
public UmbExternalLoginController(
ILogger<UmbExternalLoginController> logger,
@@ -43,7 +43,7 @@ namespace Umbraco.Cms.Web.Website.Controllers
AppCaches appCaches,
IProfilingLogger profilingLogger,
IPublishedUrlProvider publishedUrlProvider,
IMemberSignInManagerExternalLogins memberSignInManager,
IMemberSignInManager memberSignInManager,
IMemberManager memberManager,
ITwoFactorLoginService twoFactorLoginService,
IOptions<SecuritySettings> securitySettings)

4
src/Umbraco.Web.Website/Controllers/UmbTwoFactorLoginController.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Cms.Web.Website.Controllers
private readonly IMemberManager _memberManager;
private readonly ITwoFactorLoginService _twoFactorLoginService;
private readonly ILogger<UmbTwoFactorLoginController> _logger;
private readonly IMemberSignInManagerExternalLogins _memberSignInManager;
private readonly IMemberSignInManager _memberSignInManager;
public UmbTwoFactorLoginController(
ILogger<UmbTwoFactorLoginController> logger,
@@ -39,7 +39,7 @@ namespace Umbraco.Cms.Web.Website.Controllers
AppCaches appCaches,
IProfilingLogger profilingLogger,
IPublishedUrlProvider publishedUrlProvider,
IMemberSignInManagerExternalLogins memberSignInManager,
IMemberSignInManager memberSignInManager,
IMemberManager memberManager,
ITwoFactorLoginService twoFactorLoginService)
: base(