satisfy quality tools
All checks were successful
CI / eslint (pull_request) Successful in 22s
CI / prettier (pull_request) Successful in 17s
CI / test-build (pull_request) Successful in 38s

This commit is contained in:
Constantin Simonis 2025-02-19 11:39:03 +01:00
parent 0d94436639
commit 8d8adafcd3
Signed by: csimonis
GPG Key ID: 758DD9C506603183
3 changed files with 15 additions and 16 deletions

View File

@ -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);

View File

@ -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(['']);
}
}

View File

@ -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<User|null> {
return this.http.get<User|null>(`/backend/user/${id}`);
public getUser(id: string): Observable<User | null> {
return this.http.get<User | null>(`/backend/user/${id}`);
}
public createUser(id: string, username: string): Observable<User> {
@ -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();
});
}
}