Compare commits

...

2 commits

Author SHA1 Message Date
033c0c99a4
chore(deps): update devdependencies (non-major)
Some checks failed
renovate/artifacts Artifact file update failure
2025-09-03 08:02:39 +00:00
d4c44ec3ed
idk 2025-09-03 09:37:05 +02:00
3 changed files with 10 additions and 12 deletions

View file

@ -28,12 +28,12 @@
"@angular/cli": "^20.0.3",
"@angular/compiler-cli": "^20.0.4",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.1.0",
"jasmine-core": "~5.10.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.8.3"
"typescript": "~5.9.0"
}
}

View file

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

View file

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