90% done
This commit is contained in:
parent
d736143ad6
commit
e18436a57c
11 changed files with 85 additions and 25 deletions
|
@ -1,42 +0,0 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import {
|
||||
ActivatedRouteSnapshot,
|
||||
Router,
|
||||
RouterStateSnapshot
|
||||
} from '@angular/router';
|
||||
import { KeycloakAuthGuard, KeycloakService } from 'keycloak-angular';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class AuthGuard extends KeycloakAuthGuard {
|
||||
constructor(
|
||||
protected override readonly router: Router,
|
||||
protected readonly keycloak: KeycloakService
|
||||
) {
|
||||
super(router, keycloak);
|
||||
}
|
||||
|
||||
public async isAccessAllowed(
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
) {
|
||||
// Force the user to log in if currently unauthenticated.
|
||||
if (!this.authenticated) {
|
||||
await this.keycloak.login({
|
||||
redirectUri: window.location.origin + state.url
|
||||
});
|
||||
}
|
||||
|
||||
// Get the roles required from the route.
|
||||
const requiredRoles = route.data['roles'];
|
||||
|
||||
// Allow the user to proceed if no additional roles are required to access the route.
|
||||
if (!Array.isArray(requiredRoles) || requiredRoles.length === 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Allow the user to proceed if all the required roles are present.
|
||||
return requiredRoles.every((role) => this.roles.includes(role));
|
||||
}
|
||||
}
|
|
@ -1,46 +0,0 @@
|
|||
import { Injectable } from "@angular/core";
|
||||
import { EmployeeRequestPutDTO, EmployeeResponseDTO } from "../models/mitarbeiter";
|
||||
import { HttpClient } from "@angular/common/http";
|
||||
import { Observable } from "rxjs";
|
||||
import { SkillService } from "./skill.service";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class EmployeeService {
|
||||
constructor(private http: HttpClient) { }
|
||||
|
||||
|
||||
responseDtoToPutDto(employee: EmployeeResponseDTO): EmployeeRequestPutDTO {
|
||||
return {
|
||||
firstName: employee.firstName,
|
||||
lastName: employee.lastName,
|
||||
street: employee.street,
|
||||
postcode: employee.postcode,
|
||||
city: employee.city,
|
||||
phone: employee.phone,
|
||||
skillSet: employee.skillSet?.map(skill => skill.id) || [],
|
||||
}
|
||||
}
|
||||
|
||||
updateEmployee(employee: EmployeeResponseDTO) {
|
||||
this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, this.responseDtoToPutDto(employee)).subscribe();
|
||||
}
|
||||
|
||||
getAllEmployees(): Observable<Array<EmployeeResponseDTO>> {
|
||||
return this.http.get<Array<EmployeeResponseDTO>>(`${SkillService.BASE_URL}/employees`);
|
||||
}
|
||||
|
||||
|
||||
getEmployeeById(id: number): Observable<EmployeeResponseDTO> {
|
||||
return this.http.get<EmployeeResponseDTO>(`${SkillService.BASE_URL}/employees/${id}`);
|
||||
}
|
||||
|
||||
|
||||
addSkillToEmployee(skillId: number, employee: EmployeeResponseDTO) {
|
||||
let employeePut = this.responseDtoToPutDto(employee);
|
||||
employeePut.skillSet.push(skillId);
|
||||
|
||||
this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, employeePut).subscribe();
|
||||
}
|
||||
}
|
|
@ -1,20 +0,0 @@
|
|||
import { HttpClient } from "@angular/common/http";
|
||||
import { Injectable } from "@angular/core";
|
||||
import { QualificationGetDTO } from "../models/skill";
|
||||
import { Observable } from "rxjs";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class SkillService {
|
||||
|
||||
public static readonly BASE_URL = "http://localhost:8089";
|
||||
|
||||
constructor(private http: HttpClient) {
|
||||
|
||||
}
|
||||
|
||||
getAllSkills(): Observable<Array<QualificationGetDTO>> {
|
||||
return this.http.get<Array<QualificationGetDTO>>(`${SkillService.BASE_URL}/qualifications`);
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue