|
|
|
@ -63,21 +63,10 @@ namespace Volo.Abp.Account.Web.Pages.Account |
|
|
|
{ |
|
|
|
LoginInput = new LoginInputModel(); |
|
|
|
|
|
|
|
var schemes = await SchemeProvider.GetAllSchemesAsync(); |
|
|
|
|
|
|
|
var providers = schemes |
|
|
|
.Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase)) |
|
|
|
.Select(x => new ExternalProviderModel |
|
|
|
{ |
|
|
|
DisplayName = x.DisplayName, |
|
|
|
AuthenticationScheme = x.Name |
|
|
|
}) |
|
|
|
.ToList(); |
|
|
|
ExternalProviders = await GetExternalProviders(); |
|
|
|
|
|
|
|
EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); |
|
|
|
|
|
|
|
ExternalProviders = providers.ToArray(); |
|
|
|
|
|
|
|
if (IsExternalLoginOnly) |
|
|
|
{ |
|
|
|
//return await ExternalLogin(vm.ExternalLoginScheme, returnUrl);
|
|
|
|
@ -94,6 +83,10 @@ namespace Volo.Abp.Account.Web.Pages.Account |
|
|
|
|
|
|
|
ValidateModel(); |
|
|
|
|
|
|
|
ExternalProviders = await GetExternalProviders(); |
|
|
|
|
|
|
|
EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); |
|
|
|
|
|
|
|
await ReplaceEmailToUsernameOfInputIfNeeds(); |
|
|
|
|
|
|
|
var result = await SignInManager.PasswordSignInAsync( |
|
|
|
@ -140,6 +133,22 @@ namespace Volo.Abp.Account.Web.Pages.Account |
|
|
|
return RedirectSafely(ReturnUrl, ReturnUrlHash); |
|
|
|
} |
|
|
|
|
|
|
|
protected virtual async Task<List<ExternalProviderModel>> GetExternalProviders() |
|
|
|
{ |
|
|
|
var schemes = await SchemeProvider.GetAllSchemesAsync(); |
|
|
|
|
|
|
|
var providers = schemes |
|
|
|
.Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase)) |
|
|
|
.Select(x => new ExternalProviderModel |
|
|
|
{ |
|
|
|
DisplayName = x.DisplayName, |
|
|
|
AuthenticationScheme = x.Name |
|
|
|
}) |
|
|
|
.ToList(); |
|
|
|
|
|
|
|
return providers.ToList(); |
|
|
|
} |
|
|
|
|
|
|
|
[UnitOfWork] |
|
|
|
public virtual async Task<IActionResult> OnPostExternalLogin(string provider) |
|
|
|
{ |
|
|
|
|