Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat: move competition setting to ffsaf site

Browse Source
This commit is contained in:
Thibaut Valentin
2024-08-09 12:09:37 +02:00
parent b766525000
commit 27dd22080c
43 changed files with 1616 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/fr/titionfire/ffsaf/rest/AffiliationEndpoints.java
View File

@@ -30,7 +30,6 @@ public class AffiliationEndpoints {
AffiliationService service;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

1
src/main/java/fr/titionfire/ffsaf/rest/AffiliationRequestEndpoints.java
View File

@@ -35,7 +35,6 @@ public class AffiliationRequestEndpoints {
AffiliationService service;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

4
src/main/java/fr/titionfire/ffsaf/rest/AuthEndpoints.java
View File

@@ -28,7 +28,7 @@ public class AuthEndpoints {
SecurityIdentity securityIdentity;
@Inject
JsonWebToken accessToken;
JsonWebToken IdToken;
@GET
@Produces(MediaType.TEXT_PLAIN)
@@ -53,7 +53,7 @@ public class AuthEndpoints {
@APIResponse(responseCode = "401", description = "Utilisateur non authentifié")
})
public UserInfo userinfo() {
return UserInfo.makeUserInfo(accessToken, securityIdentity);
return UserInfo.makeUserInfo(IdToken, securityIdentity);
}
@GET

2
src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java
View File

@@ -15,7 +15,6 @@ import fr.titionfire.ffsaf.utils.Contact;
import fr.titionfire.ffsaf.utils.GroupeUtils;
import fr.titionfire.ffsaf.utils.PageResult;
import fr.titionfire.ffsaf.utils.Utils;
import io.quarkus.oidc.IdToken;
import io.quarkus.security.Authenticated;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
@@ -46,7 +45,6 @@ public class ClubEndpoints {
ClubService clubService;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

84
src/main/java/fr/titionfire/ffsaf/rest/CompetitionEndpoints.java Normal file
View File

@@ -0,0 +1,84 @@
package fr.titionfire.ffsaf.rest;
import fr.titionfire.ffsaf.domain.service.CompetitionService;
import fr.titionfire.ffsaf.rest.data.CompetitionData;
import fr.titionfire.ffsaf.rest.data.SimpleCompetData;
import fr.titionfire.ffsaf.utils.CompetitionSystem;
import io.quarkus.security.Authenticated;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.jwt.JsonWebToken;
import java.util.List;
@Path("api/competition/")
public class CompetitionEndpoints {
@Inject
CompetitionService service;
@Inject
JsonWebToken idToken;
@Inject
SecurityIdentity securityIdentity;
@GET
@Path("{id}")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<CompetitionData> getById(@PathParam("id") Long id) {
return service.getById(idToken, securityIdentity, id);
}
@GET
@Path("{id}/safcaData")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<SimpleCompetData> getSafcaData(@PathParam("id") Long id) {
return service.getSafcaData(idToken, securityIdentity, id);
}
@GET
@Path("all")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<List<CompetitionData>> getAll() {
return service.getAll(idToken, securityIdentity);
}
@GET
@Path("all/{system}")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<List<CompetitionData>> getAllSystem(@PathParam("system") CompetitionSystem system) {
return service.getAllSystem(idToken, securityIdentity, system);
}
@POST
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<CompetitionData> addOrUpdate(CompetitionData data) {
return service.addOrUpdate(idToken, securityIdentity, data);
}
@POST
@Path("/safcaData")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<?> setSafcaData(SimpleCompetData data) {
return service.setSafcaData(idToken, securityIdentity, data);
}
@DELETE
@Path("{id}")
@Authenticated
@Produces(MediaType.APPLICATION_JSON)
public Uni<?> delete(@PathParam("id") Long id) {
return service.delete(idToken, securityIdentity, id);
}
}

7
src/main/java/fr/titionfire/ffsaf/rest/CompteEndpoints.java
View File

@@ -32,7 +32,7 @@ public class CompteEndpoints {
KeycloakService service;
@Inject
JsonWebToken accessToken;
JsonWebToken idToken;
@Inject
SecurityIdentity securityIdentity;
@@ -53,8 +53,9 @@ public class CompteEndpoints {
})
public Uni<KeycloakService.UserCompteState> getCompte(@PathParam("id") String id) {
return service.fetchCompte(id).call(pair -> vertx.getOrCreateContext().executeBlocking(() -> {
if (!securityIdentity.getRoles().contains("federation_admin") && pair.getKey().groups().stream().map(GroupRepresentation::getPath)
.noneMatch(s -> s.startsWith("/club/") && GroupeUtils.contains(s, accessToken)))
if (!securityIdentity.getRoles().contains("federation_admin") && pair.getKey().groups().stream()
.map(GroupRepresentation::getPath)
.noneMatch(s -> s.startsWith("/club/") && GroupeUtils.contains(s, idToken)))
throw new DForbiddenException();
return pair;
})).map(Pair::getValue);

1
src/main/java/fr/titionfire/ffsaf/rest/LicenceEndpoints.java
View File

@@ -29,7 +29,6 @@ public class LicenceEndpoints {
LicenceService licenceService;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

69
src/main/java/fr/titionfire/ffsaf/rest/MatchEndpoints.java Normal file
View File

@@ -0,0 +1,69 @@
package fr.titionfire.ffsaf.rest;
import fr.titionfire.ffsaf.data.model.ClubModel;
import fr.titionfire.ffsaf.domain.service.MatchService;
import fr.titionfire.ffsaf.rest.data.MatchData;
import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
import fr.titionfire.ffsaf.utils.CompetitionSystem;
import fr.titionfire.ffsaf.utils.GroupeUtils;
import io.quarkus.security.Authenticated;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.unchecked.Unchecked;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.jwt.JsonWebToken;
import java.util.List;
import java.util.function.Consumer;
@Authenticated
@Path("api/match/{system}/")
public class MatchEndpoints {
@PathParam("system")
private CompetitionSystem system;
@Inject
MatchService service;
@Inject
JsonWebToken idToken;
@Inject
SecurityIdentity securityIdentity;
Consumer<ClubModel> checkPerm = Unchecked.consumer(clubModel -> {
if (!securityIdentity.getRoles().contains("federation_admin") && !GroupeUtils.isInClubGroup(clubModel.getId(),
idToken))
throw new DForbiddenException();
});
@GET
@Path("{id}")
@Produces(MediaType.APPLICATION_JSON)
public Uni<MatchData> getById(@PathParam("id") Long id) {
return service.getById(checkPerm, system, id);
}
@GET
@Path("getAllByPoule/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Uni<List<MatchData>> getAllByPoule(@PathParam("id") Long id) {
return service.getAllByPoule(checkPerm, system, id);
}
@POST
@Produces(MediaType.APPLICATION_JSON)
public Uni<MatchData> addOrUpdate(MatchData data) {
return service.addOrUpdate(checkPerm, system, data);
}
@DELETE
@Path("{id}")
@Produces(MediaType.APPLICATION_JSON)
public Uni<?> delete(@PathParam("id") Long id) {
return service.delete(checkPerm, id);
}
}

1
src/main/java/fr/titionfire/ffsaf/rest/MembreAdminEndpoints.java
View File

@@ -40,7 +40,6 @@ public class MembreAdminEndpoints {
String media;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

1
src/main/java/fr/titionfire/ffsaf/rest/MembreClubEndpoints.java
View File

@@ -35,7 +35,6 @@ public class MembreClubEndpoints {
String media;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

1
src/main/java/fr/titionfire/ffsaf/rest/MembreEndpoints.java
View File

@@ -40,7 +40,6 @@ public class MembreEndpoints {
String media;
@Inject
@IdToken
JsonWebToken idToken;
@Inject

68
src/main/java/fr/titionfire/ffsaf/rest/PouleEndpoints.java Normal file
View File

@@ -0,0 +1,68 @@
package fr.titionfire.ffsaf.rest;
import fr.titionfire.ffsaf.data.model.ClubModel;
import fr.titionfire.ffsaf.domain.service.PouleService;
import fr.titionfire.ffsaf.rest.data.PouleData;
import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
import fr.titionfire.ffsaf.utils.CompetitionSystem;
import fr.titionfire.ffsaf.utils.GroupeUtils;
import io.quarkus.security.Authenticated;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.unchecked.Unchecked;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.jwt.JsonWebToken;
import java.util.List;
import java.util.function.Consumer;
@Authenticated
@Path("api/poule/{system}/")
public class PouleEndpoints {
@PathParam("system")
private CompetitionSystem system;
@Inject
PouleService service;
@Inject
JsonWebToken idToken;
@Inject
SecurityIdentity securityIdentity;
Consumer<ClubModel> checkPerm = Unchecked.consumer(clubModel -> {
if (!securityIdentity.getRoles().contains("federation_admin") && !GroupeUtils.isInClubGroup(clubModel.getId(),
idToken))
throw new DForbiddenException();
});
@GET
@Path("{id}")
@Produces(MediaType.APPLICATION_JSON)
public Uni<PouleData> getById(@PathParam("id") Long id) {
return service.getById(checkPerm, system, id);
}
@GET
@Produces(MediaType.APPLICATION_JSON)
public Uni<List<PouleData>> getAll() {
return service.getAll(idToken, securityIdentity, system);
}
@POST
@Produces(MediaType.APPLICATION_JSON)
public Uni<PouleData> addOrUpdate(PouleData data) {
return service.addOrUpdate(checkPerm, system, data);
}
@DELETE
@Path("{id}")
@Produces(MediaType.APPLICATION_JSON)
public Uni<?> delete(@PathParam("id") Long id) {
return service.delete(checkPerm, id);
}
}

31
src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java Normal file
View File

@@ -0,0 +1,31 @@
package fr.titionfire.ffsaf.rest.data;
import fr.titionfire.ffsaf.data.model.CompetitionModel;
import fr.titionfire.ffsaf.utils.CompetitionSystem;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.Date;
@Data
@AllArgsConstructor
@RegisterForReflection
public class CompetitionData {
private Long id;
private String name;
private String uuid;
private Date date;
private CompetitionSystem system;
private Long club;
private String clubName;
private String owner;
public static CompetitionData fromModel(CompetitionModel model) {
if (model == null)
return null;
return new CompetitionData(model.getId(), model.getName(), model.getUuid(), model.getDate(), model.getSystem(),
model.getClub().getId(), model.getClub().getName(), model.getOwner());
}
}

31
src/main/java/fr/titionfire/ffsaf/rest/data/MatchData.java Normal file
View File

@@ -0,0 +1,31 @@
package fr.titionfire.ffsaf.rest.data;
import fr.titionfire.ffsaf.data.model.MatchModel;
import fr.titionfire.ffsaf.utils.ScoreEmbeddable;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@Data
@AllArgsConstructor
@RegisterForReflection
public class MatchData {
private Long id;
private Long c1_id;
private String c1_str;
private Long c2_id;
private String c2_str;
private Long poule;
private long poule_ord;
private List<ScoreEmbeddable> scores;
public static MatchData fromModel(MatchModel model) {
if (model == null)
return null;
return new MatchData(model.getSystemId(), model.getC1_id().getId(), model.getC1_str(), model.getC2_id().getId(),
model.getC2_str(), model.getPoule(), model.getPoule_ord(), model.getScores());
}
}

23
src/main/java/fr/titionfire/ffsaf/rest/data/PouleData.java Normal file
View File

@@ -0,0 +1,23 @@
package fr.titionfire.ffsaf.rest.data;
import fr.titionfire.ffsaf.data.model.PouleModel;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
@RegisterForReflection
public class PouleData {
private Long id;
private String name;
private Long compet;
private Integer type;
public static PouleData fromModel(PouleModel model) {
if (model == null)
return null;
return new PouleData(model.getSystemId(), model.getName(), model.getCompet().getId(), model.getType());
}
}

28
src/main/java/fr/titionfire/ffsaf/rest/data/SimpleCompetData.java Normal file
View File

@@ -0,0 +1,28 @@
package fr.titionfire.ffsaf.rest.data;
import fr.titionfire.ffsaf.net2.data.SimpleCompet;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@AllArgsConstructor
@RegisterForReflection
public class SimpleCompetData {
private long id;
private boolean show_blason;
private boolean show_flag;
private List<String> admin;
private List<String> table;
public static SimpleCompetData fromModel(SimpleCompet compet) {
if (compet == null)
return null;
return new SimpleCompetData(compet.id(), compet.show_blason(), compet.show_flag(),
new ArrayList<>(), new ArrayList<>());
}
}

28
src/main/java/fr/titionfire/ffsaf/rest/data/TreeData.java Normal file
View File

@@ -0,0 +1,28 @@
package fr.titionfire.ffsaf.rest.data;
import fr.titionfire.ffsaf.data.model.TreeModel;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
@RegisterForReflection
public class TreeData {
private Long id;
private Long poule;
private Integer level;
private MatchData match;
private TreeData left;
private TreeData right;
private TreeData associatedNode;
public static TreeData fromModel(TreeModel model) {
if (model == null)
return null;
return new TreeData(model.getId(), model.getPoule(), model.getLevel(), MatchData.fromModel(model.getMatch()),
fromModel(model.getLeft()),
fromModel(model.getRight()), null);
}
}