Skip to content

VCST-4198: Fix user resolution when using external login #2960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

VCST-4198: Fix user resolution when using external login #2960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d89b08c
VCST-4198: Fix user resolution when using external login
artem-dudarev Nov 11, 2025
f935fd8
Merge branch 'dev' into VCST-4198
kutasinaelena Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 43 additions & 32 deletions src/VirtoCommerce.Platform.Web/Security/ExternalSignInService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,14 @@ private Task<IdentityResult> SetLastLoginDate(ApplicationUser user)

private async Task<ApplicationUser> GetOrCreatePlatformUser(ExternalLoginInfo externalLoginInfo, string userName, string userEmail)
{
//Need handle the two cases
//first - when the VC platform user account already exists, it is just missing an external login info and
//second - when user does not have an account, then create a new account for them
var user = await _userManager.FindByNameAsync(userName);
var user = await _userManager.FindByLoginAsync(externalLoginInfo.LoginProvider, externalLoginInfo.ProviderKey);

if (user != null)
{
return user;
}

user = await _userManager.FindByNameAsync(userName);

if (user == null && _identityOptions.User.RequireUniqueEmail && !string.IsNullOrEmpty(userEmail))
{
Expand All @@ -119,37 +123,11 @@ private async Task<ApplicationUser> GetOrCreatePlatformUser(ExternalLoginInfo ex

if (user == null && AllowCreateNewUser(externalLoginInfo))
{
user = AbstractTypeFactory<ApplicationUser>.TryCreateInstance();
user.UserName = userName;
user.Email = userEmail;
user.EmailConfirmed = true;
user.UserType = await GetDefaultUserType(externalLoginInfo);
user.StoreId = externalLoginInfo.AuthenticationProperties.GetStoreId();
user.Status = await _settingsManager.GetValueAsync<string>(PlatformConstants.Settings.Security.DefaultExternalAccountStatus);

foreach (var userBuilder in _userBuilders)
{
await userBuilder.BuildNewUser(user, externalLoginInfo);
}

var result = await _userManager.CreateAsync(user);
if (!result.Succeeded)
{
var joinedErrors = string.Join(Environment.NewLine, result.Errors.Select(x => x.Description));
throw new InvalidOperationException("Failed to save a VC platform account due the errors: " + joinedErrors);
}

var roles = GetDefaultUserRoles(externalLoginInfo);

if (roles is { Length: > 0 })
{
await _userManager.AddToRolesAsync(user, roles);
}
user = await CreateNewUserAsync(externalLoginInfo, userName, userEmail);
}

if (user != null && await _userManager.FindByLoginAsync(externalLoginInfo.LoginProvider, externalLoginInfo.ProviderKey) == null)
if (user != null)
{
// Register a new external login
var newExternalLogin = new UserLoginInfo(externalLoginInfo.LoginProvider, externalLoginInfo.ProviderKey, externalLoginInfo.ProviderDisplayName);
await _userManager.AddLoginAsync(user, newExternalLogin);
}
Expand All @@ -163,6 +141,39 @@ private bool AllowCreateNewUser(ExternalLoginInfo externalLoginInfo)
return providerConfig?.Provider.AllowCreateNewUser == true;
}

private async Task<ApplicationUser> CreateNewUserAsync(ExternalLoginInfo externalLoginInfo, string userName, string userEmail)
{
var user = AbstractTypeFactory<ApplicationUser>.TryCreateInstance();

user.UserName = userName;
user.Email = userEmail;
user.EmailConfirmed = true;
user.UserType = await GetDefaultUserType(externalLoginInfo);
user.StoreId = externalLoginInfo.AuthenticationProperties.GetStoreId();
user.Status = await _settingsManager.GetValueAsync<string>(PlatformConstants.Settings.Security.DefaultExternalAccountStatus);

foreach (var userBuilder in _userBuilders)
{
await userBuilder.BuildNewUser(user, externalLoginInfo);
}

var createResult = await _userManager.CreateAsync(user);
if (!createResult.Succeeded)
{
var joinedErrors = string.Join(Environment.NewLine, createResult.Errors.Select(x => x.Description));
throw new InvalidOperationException("Failed to save a VC platform account due the errors: " + joinedErrors);
}

var roles = GetDefaultUserRoles(externalLoginInfo);

if (roles is { Length: > 0 })
{
await _userManager.AddToRolesAsync(user, roles);
}

return user;
}

private async Task<string> GetDefaultUserType(ExternalLoginInfo externalLoginInfo)
{
var userType = externalLoginInfo.AuthenticationProperties?.GetNewUserType();
Expand Down
Loading