|
|
|
@ -1,4 +1,4 @@ |
|
|
|
import { ConfigGetAppConfiguration, ConfigState } from '@abp/ng.core'; |
|
|
|
import { GetAppConfiguration, ConfigState } from '@abp/ng.core'; |
|
|
|
import { Component, Inject, Optional } from '@angular/core'; |
|
|
|
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; |
|
|
|
import { Navigate } from '@ngxs/router-plugin'; |
|
|
|
@ -47,7 +47,7 @@ export class LoginComponent { |
|
|
|
this.oauthService.fetchTokenUsingPasswordFlow(this.form.get('username').value, this.form.get('password').value), |
|
|
|
) |
|
|
|
.pipe( |
|
|
|
switchMap(() => this.store.dispatch(new ConfigGetAppConfiguration())), |
|
|
|
switchMap(() => this.store.dispatch(new GetAppConfiguration())), |
|
|
|
tap(() => { |
|
|
|
const redirectUrl = snq(() => window.history.state).redirectUrl || (this.options || {}).redirectUrl || '/'; |
|
|
|
this.store.dispatch(new Navigate([redirectUrl])); |
|
|
|
|