From 2326d41a9641630303ee732fa56010e6a988f47d Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 19 Feb 2025 11:39:03 +0100 Subject: [PATCH] satisfy quality tools --- frontend/src/app/auth.guard.ts | 7 ++----- .../login-success/login-success.component.ts | 4 ++-- frontend/src/app/service/user.service.ts | 20 ++++++++++--------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/frontend/src/app/auth.guard.ts b/frontend/src/app/auth.guard.ts index e97e4fc..035ccc8 100644 --- a/frontend/src/app/auth.guard.ts +++ b/frontend/src/app/auth.guard.ts @@ -1,11 +1,8 @@ -import { ActivatedRouteSnapshot, CanActivateFn, Router, RouterStateSnapshot } from '@angular/router'; +import { CanActivateFn, Router } from '@angular/router'; import { inject } from '@angular/core'; import { KeycloakService } from 'keycloak-angular'; -export const authGuard: CanActivateFn = async ( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot -) => { +export const authGuard: CanActivateFn = async () => { const keycloakService = inject(KeycloakService); const router = inject(Router); diff --git a/frontend/src/app/login-success/login-success.component.ts b/frontend/src/app/login-success/login-success.component.ts index fea0072..f0608b4 100644 --- a/frontend/src/app/login-success/login-success.component.ts +++ b/frontend/src/app/login-success/login-success.component.ts @@ -11,7 +11,7 @@ import { Router } from '@angular/router'; styleUrl: './login-success.component.css', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class LoginSuccessComponent implements OnInit{ +export class LoginSuccessComponent implements OnInit { private userService: UserService = inject(UserService); private keycloakService: KeycloakService = inject(KeycloakService); private router: Router = inject(Router); @@ -21,6 +21,6 @@ export class LoginSuccessComponent implements OnInit{ const user = await this.userService.getOrCreateUser(userProfile); sessionStorage.setItem('user', JSON.stringify(user)); - // this.router.navigate(['']); + this.router.navigate(['']); } } diff --git a/frontend/src/app/service/user.service.ts b/frontend/src/app/service/user.service.ts index 00bafe1..1f415a3 100644 --- a/frontend/src/app/service/user.service.ts +++ b/frontend/src/app/service/user.service.ts @@ -1,7 +1,7 @@ import { inject, Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { KeycloakProfile } from 'keycloak-js'; -import { async, Observable } from 'rxjs'; +import { Observable } from 'rxjs'; import { User } from '../model/User'; @Injectable({ @@ -10,8 +10,8 @@ import { User } from '../model/User'; export class UserService { private http: HttpClient = inject(HttpClient); - public getUser(id: string): Observable { - return this.http.get(`/backend/user/${id}`); + public getUser(id: string): Observable { + return this.http.get(`/backend/user/${id}`); } public createUser(id: string, username: string): Observable { @@ -25,11 +25,13 @@ export class UserService { if (userProfile.id == null) { return; } - return await this.getUser(userProfile.id).toPromise().then(async user => { - if (user) { - return user; - } - return await this.createUser(userProfile.id ?? '', userProfile.username ?? '').toPromise(); - }); + return await this.getUser(userProfile.id) + .toPromise() + .then(async (user) => { + if (user) { + return user; + } + return await this.createUser(userProfile.id ?? '', userProfile.username ?? '').toPromise(); + }); } }