import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { LoginValidatorsService } from '@app/shared/forms/form-validators/login-validators.service'
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import { Router } from '@angular/router'
@Component({
selector: 'my-login',
private openedForgotPasswordModal: NgbModalRef
constructor (
+ public router: Router,
protected formValidatorService: FormValidatorService,
private modalService: NgbModal,
private loginValidatorsService: LoginValidatorsService,
this.authService.login(username, password)
.subscribe(
- () => this.redirectService.redirectToHomepage(),
+ () => this.redirect(),
err => {
if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.')
)
}
+ redirect () {
+ const redirect = this.authService.redirectUrl
+ if (redirect) {
+ this.router.navigate([ redirect ])
+ } else {
+ this.redirectService.redirectToHomepage()
+ }
+ }
+
askResetPassword () {
this.userService.askResetPassword(this.forgotPasswordEmail)
.subscribe(