Browse Source

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

pull/3784/head
liangshiwei 7 years ago
parent
commit
76f018a7f0
  1. 6
      docs/en/CLI.md
  2. 12
      modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs

6
docs/en/CLI.md

@ -172,7 +172,11 @@ Some features of the CLI requires to be logged in to abp.io platform. To login w
abp login <username> 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 ### logout

12
modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs

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

Loading…
Cancel
Save