From 36f83ffd453bd202925b91d28d940ad0099b1f8a Mon Sep 17 00:00:00 2001 From: Breixo Senra Date: Sun, 26 Oct 2025 16:15:20 +0100 Subject: [PATCH] Quitados los @PermitAll --- .../java/es/uvigo/esei/xcs/rest/AdministratorResource.java | 2 +- rest/src/main/java/es/uvigo/esei/xcs/rest/PetResource.java | 2 +- .../es/uvigo/esei/xcs/service/AdministratorService.java | 5 +++-- .../main/java/es/uvigo/esei/xcs/service/OwnerService.java | 3 +-- .../main/java/es/uvigo/esei/xcs/service/PetService.java | 7 +++++-- .../java/es/uvigo/esei/xcs/service/VaccinationService.java | 4 +++- .../java/es/uvigo/esei/xcs/service/VaccineService.java | 4 ++-- .../main/java/es/uvigo/esei/xcs/service/VetService.java | 4 ++-- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/rest/src/main/java/es/uvigo/esei/xcs/rest/AdministratorResource.java b/rest/src/main/java/es/uvigo/esei/xcs/rest/AdministratorResource.java index 2835e35..40d6965 100644 --- a/rest/src/main/java/es/uvigo/esei/xcs/rest/AdministratorResource.java +++ b/rest/src/main/java/es/uvigo/esei/xcs/rest/AdministratorResource.java @@ -14,7 +14,7 @@ import javax.ws.rs.core.Response; import es.uvigo.esei.xcs.service.AdministratorService; import es.uvigo.esei.xcs.service.EmailService; -@Path("administrator") +@Path("admin") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public class AdministratorResource { diff --git a/rest/src/main/java/es/uvigo/esei/xcs/rest/PetResource.java b/rest/src/main/java/es/uvigo/esei/xcs/rest/PetResource.java index 7d1b6a1..bfdf4ae 100644 --- a/rest/src/main/java/es/uvigo/esei/xcs/rest/PetResource.java +++ b/rest/src/main/java/es/uvigo/esei/xcs/rest/PetResource.java @@ -29,7 +29,7 @@ import es.uvigo.esei.xcs.service.PetService; * * @author Miguel Reboiro Jato */ -@Path("pettt") +@Path("pet") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public class PetResource { diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/AdministratorService.java b/service/src/main/java/es/uvigo/esei/xcs/service/AdministratorService.java index efc3abb..0bbce93 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/AdministratorService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/AdministratorService.java @@ -10,6 +10,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import es.uvigo.esei.xcs.domain.entities.Administrator; +import es.uvigo.esei.xcs.domain.entities.User; @Stateless @RolesAllowed("ADMIN") @@ -23,14 +24,14 @@ public class AdministratorService { } - public List list(int page, int pageSize){ + public List list(int page, int pageSize){ if (page < 0) { throw new IllegalArgumentException("The page can't be negative"); } if (pageSize <= 0) { throw new IllegalArgumentException("The page size can't be negative or zero"); } - return em.createQuery("SELECT DISTINCT a FROM Administrator a", Administrator.class) + return em.createQuery("SELECT DISTINCT u FROM User u", User.class) .setFirstResult((page - 1) * pageSize) .setMaxResults(pageSize) .getResultList(); diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/OwnerService.java b/service/src/main/java/es/uvigo/esei/xcs/service/OwnerService.java index a5bf9af..008d1b5 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/OwnerService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/OwnerService.java @@ -25,8 +25,7 @@ import es.uvigo.esei.xcs.domain.entities.Vaccination; * @author Miguel Reboiro Jato */ @Stateless -//@RolesAllowed("ADMIN") -@PermitAll +@RolesAllowed("ADMIN") public class OwnerService { @PersistenceContext private EntityManager em; diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java b/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java index 3e77222..e416279 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java @@ -30,8 +30,8 @@ import es.uvigo.esei.xcs.domain.entities.Vet; * @author Miguel Reboiro Jato */ @Stateless -//@RolesAllowed("VET") -@PermitAll +@RolesAllowed({"VET", "OWNER"}) +//@PermitAll public class PetService { @Inject private Principal currentUser; @@ -201,6 +201,7 @@ public class PetService { } + @RolesAllowed("VET") public void assignVetToPet(Long petId) { requireNonNull(petId, "Pet ID can't be null"); //requireNonNull(vetLogin, "Vet login can't be null"); @@ -219,6 +220,7 @@ public class PetService { } + @RolesAllowed("VET") public void unassignVetFromPet(Long petId) { requireNonNull(petId, "Pet ID can't be null"); //requireNonNull(vetLogin, "Vet login can't be null"); @@ -240,6 +242,7 @@ public class PetService { return this.currentUser; } + @RolesAllowed("VET") public boolean isAssignedToCurrentVet(Long petId) { requireNonNull(petId, "Pet ID can't be null"); diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/VaccinationService.java b/service/src/main/java/es/uvigo/esei/xcs/service/VaccinationService.java index 3819f0b..7864937 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/VaccinationService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/VaccinationService.java @@ -9,6 +9,7 @@ import java.text.SimpleDateFormat; import java.util.List; import javax.annotation.security.PermitAll; +import javax.annotation.security.RolesAllowed; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.inject.Inject; @@ -22,7 +23,8 @@ import es.uvigo.esei.xcs.domain.entities.Vaccination; import es.uvigo.esei.xcs.domain.entities.Vaccine; @Stateless -@PermitAll +@RolesAllowed("VET") +//@PermitAll public class VaccinationService { @Inject private Principal currentUser; diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/VaccineService.java b/service/src/main/java/es/uvigo/esei/xcs/service/VaccineService.java index 565eb51..6cc6880 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/VaccineService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/VaccineService.java @@ -18,8 +18,8 @@ import es.uvigo.esei.xcs.domain.entities.Pet; import es.uvigo.esei.xcs.domain.entities.Vaccine; @Stateless -@PermitAll -//@RolesAllowed("VET") +//@PermitAll +@RolesAllowed("VET") public class VaccineService { @PersistenceContext private EntityManager em; diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/VetService.java b/service/src/main/java/es/uvigo/esei/xcs/service/VetService.java index 7d1e825..7b6d1d0 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/VetService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/VetService.java @@ -18,8 +18,8 @@ import es.uvigo.esei.xcs.domain.entities.Vaccination; import es.uvigo.esei.xcs.domain.entities.Vet; @Stateless -//@RolesAllowed("VET") -@PermitAll +@RolesAllowed("VET") +//@PermitAll public class VetService { @Inject private Principal currentUser; -- 2.18.1