fix: Locations fixed. (#136)

Author: antoniotarricone

src/main/java/it/pagopa/swclient/mil/auth/admin/resource/ClientResource.java

@@ -5,9 +5,12 @@
  */
 package it.pagopa.swclient.mil.auth.admin.resource;
 
+import java.net.URI;
 import java.util.List;
 import java.util.UUID;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 import com.mongodb.MongoWriteException;
 
 import io.quarkus.logging.Log;
@@ -43,11 +46,9 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
 
 /**
  * 
@@ -59,6 +60,12 @@
 	"mil-auth-admin"
 })
 public class ClientResource {
+	/*
+	 * mil-auth base URL.
+	 */
+	@ConfigProperty(name = "base-url", defaultValue = "")
+	String baseUrl;
+	
 	/*
 	 * 
 	 */
@@ -121,12 +128,11 @@ private WebApplicationException onPersistError(Throwable t) {
 	/**
 	 * 
 	 * @param req
-	 * @param uriInfo
 	 * @return
 	 */
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Uni<Response> create(@Valid CreateOrUpdateClientRequest req, @Context UriInfo uriInfo) {
+	public Uni<Response> create(@Valid CreateOrUpdateClientRequest req) {
 		Log.tracef("Create a new client: %s", req.toString());
 
 		/*
@@ -158,11 +164,7 @@ public Uni<Response> create(@Valid CreateOrUpdateClientRequest req, @Context Uri
 			.map(e -> {
 				CreateClientResponse res = new CreateClientResponse(clientId, triplet.getSecret());
 				Log.debugf("Client created successfully: %s", res.toString());
-				return Response.created(
-					uriInfo
-						.getAbsolutePathBuilder()
-						.path(clientId)
-						.build())
+				return Response.created(URI.create(baseUrl + "/admin/clients/" + clientId))
 					.entity(res)
 					.build();
 			})

src/main/java/it/pagopa/swclient/mil/auth/admin/resource/RolesResource.java

@@ -5,9 +5,12 @@
  */
 package it.pagopa.swclient.mil.auth.admin.resource;
 
+import java.net.URI;
 import java.util.List;
 import java.util.UUID;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 import com.mongodb.MongoWriteException;
 
 import io.quarkus.logging.Log;
@@ -41,11 +44,9 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
 
 /**
  * <p>
@@ -60,6 +61,12 @@
 	"mil-auth-admin"
 })
 public class RolesResource {
+	/*
+	 * mil-auth base URL.
+	 */
+	@ConfigProperty(name = "base-url", defaultValue = "")
+	String baseUrl;
+	
 	/**
 	 * <p>
 	 * Repository of roles entities.
@@ -121,12 +128,11 @@ private WebApplicationException onPersistError(Throwable t) {
 	/**
 	 * 
 	 * @param req
-	 * @param uriInfo
 	 * @return
 	 */
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Uni<Response> create(@Valid CreateOrUpdateSetOfRolesRequest req, @Context UriInfo uriInfo) {
+	public Uni<Response> create(@Valid CreateOrUpdateSetOfRolesRequest req) {
 		Log.tracef("Create a new list of roles: %s", req.toString());
 
 		String id = UUID.randomUUID().toString();
@@ -146,11 +152,7 @@ public Uni<Response> create(@Valid CreateOrUpdateSetOfRolesRequest req, @Context
 			req.getRoles());
 
 		return repository.persist(entity)
-			.map(e -> Response.created(
-				uriInfo.getAbsolutePathBuilder()
-					.path(id)
-					.build())
-				.build())
+			.map(e -> Response.created(URI.create(baseUrl + "/admin/roles/" + id)).build())
 			.invoke(() -> Log.debug("List of roles created successfully"))
 			.onFailure().transform(this::onPersistError);
 	}