Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeAlhayek committed Jun 10, 2024
1 parent f210886 commit 31967ed
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class AccountController : AccountBaseController
private readonly IClock _clock;
private readonly IDistributedCache _distributedCache;
private readonly IEnumerable<IExternalLoginEventHandler> _externalLoginHandlers;
private readonly IEnumerable<IUserToExternalLoginProvider> _externalLoginUserLocator;
private readonly IEnumerable<IUserToExternalLoginProvider> _userToExternalLoginProviders;

private static readonly JsonMergeSettings _jsonMergeSettings = new()
{
Expand Down Expand Up @@ -80,7 +80,7 @@ public class AccountController : AccountBaseController
IDisplayManager<LoginForm> loginFormDisplayManager,
IUpdateModelAccessor updateModelAccessor,
IEnumerable<IExternalLoginEventHandler> externalLoginHandlers,
IEnumerable<IUserToExternalLoginProvider> externalLoginUserLocator)
IEnumerable<IUserToExternalLoginProvider> userToExternalLoginProviders)
{
_signInManager = signInManager;
_userManager = userManager;
Expand All @@ -97,7 +97,7 @@ public class AccountController : AccountBaseController
_updateModelAccessor = updateModelAccessor;
_externalLoginHandlers = externalLoginHandlers;
// Reverse the order of services to prioritize external services first, placing them before the default implementation.
_externalLoginUserLocator = externalLoginUserLocator.Reverse();
_userToExternalLoginProviders = userToExternalLoginProviders.Reverse();

H = htmlLocalizer;
S = stringLocalizer;
Expand Down Expand Up @@ -405,7 +405,7 @@ public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null,
}
else
{
var userLocator = _externalLoginUserLocator.Where(x => x.CanHandle(info)).FirstOrDefault();
var userLocator = _externalLoginUserLocator.FirstOrDefault(x => x.CanHandle(info));
if (userLocator != null) {
iUser = await userLocator.GetUserAsync(info);
}
Expand Down Expand Up @@ -657,7 +657,7 @@ public async Task<IActionResult> LinkExternalLogin(LinkExternalLoginViewModel mo
return NotFound();
}

var userLocator = _externalLoginUserLocator.Where(x => x.CanHandle(info)).FirstOrDefault();
var userLocator = _userToExternalLoginProviders.FirstOrDefault(x => x.CanHandle(info));
var user = await userLocator?.GetUserAsync(info);

if (user == null)
Expand Down

0 comments on commit 31967ed

Please sign in to comment.