vuminh224/hackathon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source
This commit is contained in:
Alexis Leboeuf
2026-01-09 13:50:39 +01:00
parent 56071f0448 e52ba2fe3b
commit 1ec1f318f6
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
back_end/src/main/java/hackathon/FrisbYEE/rest/CoachResource.java
View File

@@ -101,6 +101,7 @@ public class CoachResource {
Coach coach = new Coach(); Coach coach = new Coach();
coach.setKeycloakId(dto.getId_keycloak()); coach.setKeycloakId(dto.getId_keycloak());
coach.setName(dto.getName()); coach.setName(dto.getName());
coach.setRole(hackathon.FrisbYEE.jpa.metier.Role.coach);
coach.setPrenom(dto.getPrenom()); coach.setPrenom(dto.getPrenom());
return coach; return coach;
} }

2
front_end/src/classes.tsx
View File

@@ -105,7 +105,7 @@ export class Coach extends User{
id_keycloak: this.keycloakId, id_keycloak: this.keycloakId,
name: this.nom, name: this.nom,
prenom: this.prenom, prenom: this.prenom,
sessionIds: this.sessionsID, sessionIds: this.sessionsID ,
}; };
return dto; return dto;
} }

16
front_end/src/requetes.tsx
View File

@@ -24,30 +24,30 @@ export async function loginOrRegister(keycloak:Keycloak): Promise<User|null>{
if(roles.includes("admin")){ if(roles.includes("admin")){
const id = keycloak.tokenParsed?.sub; const id = keycloak.tokenParsed?.sub;
if(id!=null){ if(id!=null){
const response = await athleteService.getByKeycloakId(id); const response = await athleteService.create(id);
const admin = new Admin(response.data); const admin = new Admin(response.data);
return admin; return admin;
} }
} }
else if(roles.includes("coach")){ else if(roles.includes("coach")){
const id = keycloak.tokenParsed?.sub; const newCoach: Coach = new Coach();
if(id!=null){ newCoach.keycloakId = keycloak.tokenParsed.sub || "";
const response = await coachService.getByKeycloakId(id); newCoach.email = keycloak.tokenParsed.email || "";
newCoach.nom = keycloak.tokenParsed.family_name || "";
newCoach.prenom = keycloak.tokenParsed.given_name || "";
const response = await coachService.create(newCoach.toDTO());
const coach = new Coach(response.data); const coach = new Coach(response.data);
return coach; return coach;
}
} }
else if(roles.includes("athlete")){ else if(roles.includes("athlete")){
console.error("role = Athlete");
const newAthlete: Athlete = new Athlete(); const newAthlete: Athlete = new Athlete();
newAthlete.keycloakId = keycloak.tokenParsed.sub || ""; newAthlete.keycloakId = keycloak.tokenParsed.sub || "";
newAthlete.email = keycloak.tokenParsed.email || ""; newAthlete.email = keycloak.tokenParsed.email || "";
newAthlete.nom = keycloak.tokenParsed.family_name || ""; newAthlete.nom = keycloak.tokenParsed.family_name || "";
newAthlete.prenom = keycloak.tokenParsed.given_name || ""; newAthlete.prenom = keycloak.tokenParsed.given_name || "";
const response = await athleteService.create(newAthlete.toDTO()); const response = await athleteService.create(newAthlete.toDTO());
console.log(response);
const athlete = new Athlete(response.data); const athlete = new Athlete(response.data);
console.log(athlete);
return athlete; return athlete;
} }
else console.error("Error : role inconnu"); else console.error("Error : role inconnu");