added return url

pull/6/head
FlayInAHook 4 years ago
parent ecc8a61102
commit 4eb57f72e4

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormControl, Validators } from '@angular/forms'; import { FormControl, Validators } from '@angular/forms';
import { Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { AuthService } from '../../services/auth.service'; import { AuthService } from '../../services/auth.service';
@Component({ @Component({
@ -15,9 +15,14 @@ export class LoginComponent implements OnInit {
loading = false; loading = false;
errorOccurred = false; errorOccurred = false;
errorMessage = ''; errorMessage = '';
constructor(private authService: AuthService, private router: Router) {}
ngOnInit(): void {} returnUrl : string;
constructor(private authService: AuthService, private router: Router, private route: ActivatedRoute) {}
ngOnInit(): void {
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/tableOverview';
}
login() { login() {
this.errorMessage = ''; this.errorMessage = '';
@ -29,7 +34,7 @@ export class LoginComponent implements OnInit {
this.authService this.authService
.login(this.email.value, this.password.value) .login(this.email.value, this.password.value)
.subscribe( .subscribe(
() => this.router.navigate(['tableOverview']), () => this.router.navigateByUrl(this.returnUrl),
(error) => { (error) => {
this.errorOccurred = true; this.errorOccurred = true;
this.errorMessage = this.errorMessage =

Loading…
Cancel
Save