Angular/auth
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

idk

Browse source
This commit is contained in:
Jan K9f 2025-09-03 09:37:02 +02:00
commit d4c44ec3ed
Signed by: jank
GPG key ID: 22BEAC760B3333D6
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/app/component/auth/login/login.component.ts
View file

@ -1,4 +1,4 @@
import { Component, inject, OnInit } from '@angular/core'; import { Component, inject } from '@angular/core';
import { import {
FormBuilder, FormBuilder,
FormGroup, FormGroup,
@ -6,7 +6,7 @@ import {
Validators, Validators,
} from '@angular/forms'; } from '@angular/forms';
import AuthService from '../../../service/auth.service'; import AuthService from '../../../service/auth.service';
import { AuthResponse, Token } from '../../../models'; import { AuthResponse } from '../../../models';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
@Component({ @Component({
@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router';
imports: [ReactiveFormsModule], imports: [ReactiveFormsModule],
templateUrl: './login.component.html', templateUrl: './login.component.html',
}) })
export default class LoginComponent implements OnInit { export default class LoginComponent {
fb: FormBuilder = inject(FormBuilder); fb: FormBuilder = inject(FormBuilder);
authService: AuthService = inject(AuthService); authService: AuthService = inject(AuthService);
router: Router = inject(Router); router: Router = inject(Router);
@ -25,12 +25,6 @@ export default class LoginComponent implements OnInit {
password: [null, [Validators.required]], password: [null, [Validators.required]],
}); });
returnUrl: string | undefined;
ngOnInit(): void {
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/dashboard';
}
login() { login() {
if (this.form.invalid) { if (this.form.invalid) {
console.log(this.form.errors); console.log(this.form.errors);
@ -41,7 +35,10 @@ export default class LoginComponent implements OnInit {
localStorage.setItem('access_token', r.accessToken); localStorage.setItem('access_token', r.accessToken);
localStorage.setItem('refresh_token', r.refreshToken); localStorage.setItem('refresh_token', r.refreshToken);
this.router.navigate([this.returnUrl]); const returnUrl =
this.route.snapshot.queryParams['returnUrl'] || '/dashboard';
this.router.navigate([returnUrl]);
}); });
} }
} }

1
src/app/service/auth.guard.ts
View file

@ -22,6 +22,7 @@ export const authGuard: CanActivateFn = (route, state) => {
console.log(err); console.log(err);
router.navigate(['/auth/login'], { router.navigate(['/auth/login'], {
queryParams: { returnUrl: state.url }, queryParams: { returnUrl: state.url },
skipLocationChange: true,
}); });
return of(false); return of(false);
}), }),