maliming
3 years ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
2 changed files with
7 additions and
2 deletions
-
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml
-
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
|
|
|
@ -12,7 +12,7 @@ |
|
|
|
<a href="@Url.Page("./Login", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Login"]</a> |
|
|
|
</strong> |
|
|
|
<form method="post" class="mt-4"> |
|
|
|
@if (Model.EnableLocalRegister) |
|
|
|
@if ((!Model.IsExternalLogin || Model.UserNameExtracted) && Model.EnableLocalRegister) |
|
|
|
{ |
|
|
|
<abp-input asp-for="Input.UserName" auto-focus="true"/> |
|
|
|
} |
|
|
|
|
|
|
|
@ -36,6 +36,7 @@ public class RegisterModel : AccountPageModel |
|
|
|
[BindProperty(SupportsGet = true)] |
|
|
|
public string ExternalLoginAuthSchema { get; set; } |
|
|
|
|
|
|
|
public bool UserNameExtracted { get; set; } |
|
|
|
public IEnumerable<ExternalProviderModel> ExternalProviders { get; set; } |
|
|
|
public IEnumerable<ExternalProviderModel> VisibleExternalProviders => ExternalProviders.Where(x => !string.IsNullOrWhiteSpace(x.DisplayName)); |
|
|
|
public bool EnableLocalRegister { get; set; } |
|
|
|
@ -122,7 +123,11 @@ public class RegisterModel : AccountPageModel |
|
|
|
Logger.LogWarning("External login info is not available"); |
|
|
|
return RedirectToPage("./Login"); |
|
|
|
} |
|
|
|
|
|
|
|
if (Input.UserName.IsNullOrWhiteSpace()) |
|
|
|
{ |
|
|
|
Input.UserName = await GetUserNameFromEmail(Input.EmailAddress); |
|
|
|
} |
|
|
|
UserNameExtracted = true; |
|
|
|
await RegisterExternalUserAsync(externalLoginInfo, Input.UserName, Input.EmailAddress); |
|
|
|
} |
|
|
|
else |
|
|
|
|