diff --git a/src/main/java/com/redhat/labs/lodestar/model/Engagement.java b/src/main/java/com/redhat/labs/lodestar/model/Engagement.java index e19fdbe7..f93b3eb0 100644 --- a/src/main/java/com/redhat/labs/lodestar/model/Engagement.java +++ b/src/main/java/com/redhat/labs/lodestar/model/Engagement.java @@ -116,7 +116,7 @@ public class Engagement extends PanacheMongoEntityBase { */ public EngagementState getEngagementCurrentState(LocalDateTime currentDate) { - if (launch == null || endDate == null || startDate == null) { // not launched or irregularly launched + if (launch == null || endDate == null || startDate == null) { // not launched o irregularly launched return EngagementState.UPCOMING; } diff --git a/src/main/java/com/redhat/labs/lodestar/rest/client/JWTRequestFactory.java b/src/main/java/com/redhat/labs/lodestar/rest/client/JWTRequestFactory.java new file mode 100644 index 00000000..13b7af34 --- /dev/null +++ b/src/main/java/com/redhat/labs/lodestar/rest/client/JWTRequestFactory.java @@ -0,0 +1,30 @@ +package com.redhat.labs.lodestar.rest.client; + +import javax.ws.rs.core.MultivaluedMap; + +import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; +import org.jboss.resteasy.specimpl.MultivaluedMapImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JWTRequestFactory implements ClientHeadersFactory { + private static final Logger LOGGER = LoggerFactory.getLogger(JWTRequestFactory.class); + + + @Override + public MultivaluedMap update(MultivaluedMap incomingHeaders, + MultivaluedMap clientOutgoingHeaders) { + + if(LOGGER.isTraceEnabled()) { + incomingHeaders.entrySet().forEach(e -> { + LOGGER.trace(String.format("Header %s Value %s", e.getKey(), e.getValue())); + }); + } + + MultivaluedMap result = new MultivaluedMapImpl(); + result.add("Authorization", incomingHeaders.getFirst("Authorization")); + + return result; + } + +} diff --git a/src/main/java/com/redhat/labs/lodestar/rest/client/LodeStarConfigApiClient.java b/src/main/java/com/redhat/labs/lodestar/rest/client/LodeStarConfigApiClient.java index d53e0bf3..04b16980 100644 --- a/src/main/java/com/redhat/labs/lodestar/rest/client/LodeStarConfigApiClient.java +++ b/src/main/java/com/redhat/labs/lodestar/rest/client/LodeStarConfigApiClient.java @@ -7,6 +7,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; +import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -15,6 +16,7 @@ @ApplicationScoped @RegisterRestClient(configKey = "lodestar.config.api") @RegisterProvider(value = LodeStarGitLabAPIServiceResponseMapper.class, priority = 50) +@RegisterClientHeaders(JWTRequestFactory.class) public interface LodeStarConfigApiClient { @GET