SZUT/EMS
10
0
Fork 0
Code Issues Pull requests Projects Activity Actions

Fix: Auth Bcakground reload after auth
All checks were successful
Quality Check / Linting (push) Successful in 29s
Details

Browse source
This commit is contained in:
Dominik Säume 2025-01-22 10:04:14 +01:00
parent 28bb4e220e
commit 523e5f4eee
3 changed files with 71 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/app/core/auth/auth.service.ts
View file

@ -1,28 +1,26 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CanActivate, GuardResult, MaybeAsync, RedirectCommand, Router } from '@angular/router'; import { CanActivate, GuardResult, MaybeAsync, RedirectCommand, Router } from '@angular/router';
import UserData from '@core/auth/UserData'; import UserData from '@core/auth/UserData';
import { OpenAPI } from '@core/ems';
import { OidcSecurityService } from 'angular-auth-oidc-client'; import { OidcSecurityService } from 'angular-auth-oidc-client';
import { Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
import { OpenAPI } from '../ems';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class AuthService implements CanActivate { export class AuthService implements CanActivate {
public $user: Observable<UserData | undefined>; public $user: BehaviorSubject<UserData | undefined>;
constructor(private readonly oidcSecurityService: OidcSecurityService, private router: Router) { constructor(private readonly oidcSecurityService: OidcSecurityService, private router: Router) {
this.$user = new Observable((publish) => { this.$user = new BehaviorSubject<UserData | undefined>(undefined);
this.oidcSecurityService.checkAuth().subscribe(({ isAuthenticated, userData }) => { this.oidcSecurityService.checkAuth().subscribe(({ isAuthenticated, userData, accessToken }) => {
publish.next(isAuthenticated ? { OpenAPI.TOKEN = accessToken;
const isLoggedIn = isAuthenticated && userData != null && accessToken != '';
this.$user.next(isLoggedIn ? {
username: userData.preferred_username, username: userData.preferred_username,
verified: userData.email_verified verified: userData.email_verified
} : undefined); } : undefined);
}); });
});
this.oidcSecurityService.getAccessToken().subscribe(token => OpenAPI.TOKEN = token);
} }
canActivate(): MaybeAsync<GuardResult> { canActivate(): MaybeAsync<GuardResult> {

16
src/app/views/dashboard/dashboard.component.ts
View file

@ -1,5 +1,5 @@
import { AsyncPipe } from '@angular/common'; import { AsyncPipe } from '@angular/common';
import {Component} from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
@ -14,7 +14,7 @@ import Filter from '@app/views/dashboard/Filter';
import { AuthService } from '@core/auth/auth.service'; import { AuthService } from '@core/auth/auth.service';
import { Employee, EmployeeService, Qualification, QualificationService } from '@core/ems'; import { Employee, EmployeeService, Qualification, QualificationService } from '@core/ems';
import { NotificationService, NotificationType } from '@core/notification/notification.service'; import { NotificationService, NotificationType } from '@core/notification/notification.service';
import {Observable} from 'rxjs'; import { Observable, of } from 'rxjs';
@Component({ @Component({
selector: 'app-dashboard', selector: 'app-dashboard',
@ -22,13 +22,13 @@ import {Observable} from 'rxjs';
templateUrl: './dashboard.component.html', templateUrl: './dashboard.component.html',
styleUrl: './dashboard.component.scss' styleUrl: './dashboard.component.scss'
}) })
export class DashboardComponent { export class DashboardComponent implements OnInit {
selectedQualificationFilter: Qualification | undefined; selectedQualificationFilter: Qualification | undefined;
fuzzyFilter: string = ''; fuzzyFilter: string = '';
employeeDataSource: MatTableDataSource<Employee> = new MatTableDataSource<Employee>([]); employeeDataSource: MatTableDataSource<Employee> = new MatTableDataSource<Employee>([]);
employeesDisplayedColumns = ['id', 'first-name', 'last-name', 'skills', 'actions']; employeesDisplayedColumns = ['id', 'first-name', 'last-name', 'skills', 'actions'];
$qualifications: Observable<Array<Qualification> | undefined>; $qualifications: Observable<Array<Qualification> | undefined> = of();
constructor( constructor(
protected auth: AuthService, protected auth: AuthService,
@ -36,7 +36,12 @@ export class DashboardComponent {
private qualificationService: QualificationService, private qualificationService: QualificationService,
private dialog: MatDialog, private dialog: MatDialog,
private notifications: NotificationService private notifications: NotificationService
) { ) { }
ngOnInit(): void {
this.auth.$user.subscribe((user) => {
if (user === undefined) {
return;
}
this.$qualifications = this.qualificationService.getAllQualifications(); this.$qualifications = this.qualificationService.getAllQualifications();
this.employeeService.getAllEmployees().subscribe((employees) => { this.employeeService.getAllEmployees().subscribe((employees) => {
this.employeeDataSource = new MatTableDataSource(employees); this.employeeDataSource = new MatTableDataSource(employees);
@ -66,6 +71,7 @@ export class DashboardComponent {
}; };
}); });
});
} }
onDelete(employee: Employee) { onDelete(employee: Employee) {