Merge remote-tracking branch 'abpframework/dev' into docs

pull/3784/head
liangshiwei 5 years ago
commit 76f018a7f0

@ -172,7 +172,11 @@ Some features of the CLI requires to be logged in to abp.io platform. To login w
abp login <username>
```
Notice that, a new login with an already active session, will kill the previous session and creates a new one.
```bash
abp login <username> -p <password>
```
Notice that, a new login with an already active session, overwrites the previous session.
### logout

@ -29,12 +29,12 @@ namespace Volo.Abp.Account.Web.Pages.Account
public IdentityServerSupportedLoginModel(
IAuthenticationSchemeProvider schemeProvider,
IOptions<AbpAccountOptions> accountOptions,
IIdentityServerInteractionService interaction,
IClientStore clientStore,
IOptions<AbpAccountOptions> accountOptions,
IIdentityServerInteractionService interaction,
IClientStore clientStore,
IEventService identityServerEvents)
:base(
schemeProvider,
schemeProvider,
accountOptions)
{
Interaction = interaction;
@ -95,7 +95,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
return Page();
}
[UnitOfWork] //TODO: Will be removed when we implement action filter
public override async Task<IActionResult> OnPostAsync(string action)
{
if (action == "Cancel")
@ -116,7 +115,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
ValidateModel();
ExternalProviders = await GetExternalProviders();
EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
await ReplaceEmailToUsernameOfInputIfNeeds();
@ -166,7 +165,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
return RedirectSafely(ReturnUrl, ReturnUrlHash);
}
[UnitOfWork]
public override async Task<IActionResult> OnPostExternalLogin(string provider)
{
if (AccountOptions.WindowsAuthenticationSchemeName == provider)

Loading…
Cancel
Save