From 7eebd12699cc590d4a85dffcd248bed693796f78 Mon Sep 17 00:00:00 2001 From: csimonis Date: Wed, 2 Apr 2025 13:07:10 +0200 Subject: [PATCH] feat(login): log user info on successful login success page --- .../login-success/login-success.component.ts | 2 +- frontend/src/app/service/auth.service.ts | 22 +++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/feature/login-success/login-success.component.ts b/frontend/src/app/feature/login-success/login-success.component.ts index e425e7a..0cc227b 100644 --- a/frontend/src/app/feature/login-success/login-success.component.ts +++ b/frontend/src/app/feature/login-success/login-success.component.ts @@ -12,8 +12,8 @@ import { User } from '../../model/User'; changeDetection: ChangeDetectionStrategy.OnPush, }) export default class LoginSuccessComponent implements OnInit { - private router: Router = inject(Router); private authService: AuthService = inject(AuthService); async ngOnInit() { + console.log(this.authService.getUser()) } } diff --git a/frontend/src/app/service/auth.service.ts b/frontend/src/app/service/auth.service.ts index 6e082ea..014ce5a 100644 --- a/frontend/src/app/service/auth.service.ts +++ b/frontend/src/app/service/auth.service.ts @@ -1,6 +1,5 @@ import { inject, Injectable } from '@angular/core'; -import { Subject } from 'rxjs'; -import { AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; +import { AuthConfig, OAuthService } from 'angular-oauth2-oidc'; import { UserService } from './user.service'; import { User } from '../model/User'; import { Router } from '@angular/router'; @@ -23,41 +22,28 @@ export class AuthService { strictDiscoveryDocumentValidation: false, skipIssuerCheck: true, disableAtHashCheck: true, - jwks: { - skipJwksValidation: true, - } }; private userService: UserService = inject(UserService); private oauthService: OAuthService = inject(OAuthService); - private oauthStorage: OAuthStorage = inject(OAuthStorage); private router: Router = inject(Router); - private isAuthenticated = new Subject(); private user: User | null = null; constructor() { - console.log(1); - this.oauthService.setStorage(localStorage); this.oauthService.configure(this.authConfig); this.oauthService.events.subscribe((event) => { - console.log(2, event.type); if (event.type === 'token_received') { - console.log(3); - this.oauthStorage.setItem('jwt', this.getAccessToken()); this.oauthService.loadUserProfile().then((profile) => { - console.log(4); + console.log(profile); this.fromUserProfile(profile).subscribe((user) => { - console.log(5); this.user = user; - console.log(user); this.router.navigate(['home']); }); }); } }); this.oauthService.loadDiscoveryDocumentAndTryLogin().then(() => { - this.isAuthenticated.next(this.oauthService.hasValidAccessToken()); }); } @@ -67,7 +53,6 @@ export class AuthService { logout() { this.oauthService.logOut(); - this.isAuthenticated.next(false); } isLoggedIn() { @@ -81,4 +66,7 @@ export class AuthService { getAccessToken() { return this.oauthService.getAccessToken(); } + getUser() { + return this.user; + } }