From beee601a574107d0fe7294cf6f8803c83a499c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Thu, 18 Mar 2021 16:32:10 +0100 Subject: [PATCH] Correction autour de l'administrateur --- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../list-of-aircrafts.component.ts | 2 +- .../src/app/list-of-dzs/list-of-dzs.component.ts | 2 +- .../list-of-jump-types.component.ts | 2 +- .../app/user-profile/user-profile.component.ts | 12 +++++------- Front/skydivelogs-app/src/models/user.ts | 4 +++- .../src/services/authentication.service.ts | 16 +++++++++++++--- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Back/skydiveLogs-api/Properties/PublishProfiles/FolderProfile.pubxml.user b/Back/skydiveLogs-api/Properties/PublishProfiles/FolderProfile.pubxml.user index 7a69c51..cfdba0d 100644 --- a/Back/skydiveLogs-api/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Back/skydiveLogs-api/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_PublishTargetUrl>C:\Projects\SkydiveLogs\Back\dist - True|2021-03-18T13:10:46.8227017Z;True|2021-03-15T15:33:07.2658649+01:00; + True|2021-03-18T15:30:10.7797171Z;True|2021-03-18T14:10:46.8227017+01:00;True|2021-03-15T15:33:07.2658649+01:00; \ No newline at end of file diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts index 1b9041a..70955e4 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts @@ -26,7 +26,7 @@ export class ListOfAircraftsComponent implements OnInit { private serviceComm: ServiceComm, private authenticationService: AuthenticationService, public dialog: MatDialog) { - this.isUserAdmin = this.authenticationService.currentUserValue.IsAdmin; + this.isUserAdmin = this.authenticationService.currentUserValue.roles === "admin"; } ngOnInit() { diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts index 21c70e6..ea593f6 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts @@ -32,7 +32,7 @@ export class ListOfDzsComponent implements OnInit { private serviceComm: ServiceComm, private authenticationService: AuthenticationService, public dialog: MatDialog) { - this.isUserAdmin = this.authenticationService.currentUserValue.IsAdmin; + this.isUserAdmin = this.authenticationService.currentUserValue.roles === "admin"; } ngOnInit() { diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts index e0e13ab..aeb29f6 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts @@ -26,7 +26,7 @@ export class ListOfJumpTypesComponent implements OnInit { private serviceComm: ServiceComm, private authenticationService: AuthenticationService, public dialog: MatDialog) { - this.isUserAdmin = this.authenticationService.currentUserValue.IsAdmin; + this.isUserAdmin = this.authenticationService.currentUserValue.roles === "admin"; } ngOnInit() { diff --git a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts index dfdbca2..71f95a3 100644 --- a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts +++ b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts @@ -49,13 +49,11 @@ export class UserProfileComponent implements OnInit { return; } - const updatedUser = new User(); - updatedUser.login = formData.username; - updatedUser.password = formData.password; - updatedUser.firstName = formData.firstname; - updatedUser.lastName = formData.lastname; - updatedUser.email = formData.email; + // const updatedUser = new User(); + // updatedUser.firstName = formData.firstName; + // updatedUser.lastName = formData.lastName; + // updatedUser.email = formData.email; - this.authenticationService.create(updatedUser); + // this.authenticationService.update(updatedUser); } } diff --git a/Front/skydivelogs-app/src/models/user.ts b/Front/skydivelogs-app/src/models/user.ts index df89a32..cd61f97 100644 --- a/Front/skydivelogs-app/src/models/user.ts +++ b/Front/skydivelogs-app/src/models/user.ts @@ -9,5 +9,7 @@ export class User { authdata?: string; token?: string; - get IsAdmin() { return this.roles === "admin"; } + public get isAdmin(): boolean { + return this.roles === "admin"; + } } diff --git a/Front/skydivelogs-app/src/services/authentication.service.ts b/Front/skydivelogs-app/src/services/authentication.service.ts index 54bc853..0757126 100644 --- a/Front/skydivelogs-app/src/services/authentication.service.ts +++ b/Front/skydivelogs-app/src/services/authentication.service.ts @@ -38,7 +38,7 @@ export class AuthenticationService extends BaseService { bodyLogin, { headers: this.headers }) .pipe(map(user => { - this.pushUserToken(username, password, user); + this.pushToken(username, password, user); return user; })); } @@ -48,12 +48,22 @@ export class AuthenticationService extends BaseService { newUser, { headers: this.headers }) .pipe(map(user => { - this.pushUserToken(newUser.login, newUser.password, user); + this.pushToken(newUser.login, newUser.password, user); return user; })); } - private pushUserToken(login: string, password: string, user: User){ + public update(updatedUser: User) { + return this.http.put(`${this.apiUrl}/User/${updatedUser.id}`, + updatedUser, + { headers: this.headers }) + .pipe(map(user => { + this.pushToken(updatedUser.login, updatedUser.password, user); + return user; + })); + } + + private pushToken(login: string, password: string, user: User){ if (user && user.token) { user.authdata = window.btoa(login + ":" + password); localStorage.setItem("currentUser", JSON.stringify(user));