diff --git a/hartmann-foto-documentation-app/pom.xml b/hartmann-foto-documentation-app/pom.xml index 414eca1..3d765e4 100644 --- a/hartmann-foto-documentation-app/pom.xml +++ b/hartmann-foto-documentation-app/pom.xml @@ -9,7 +9,7 @@ ../hartmann-foto-documentation/pom.xml hartmann-foto-documentation-app - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT jar hartmann-foto-documentation app @@ -42,17 +42,17 @@ - org.wildfly.security - wildfly-elytron - 2.5.2.Final - provided + org.wildfly.security + wildfly-elytron + 2.5.2.Final + provided - org.wildfly.security - wildfly-elytron-credential - 2.5.2.Final - provided + org.wildfly.security + wildfly-elytron-credential + 2.5.2.Final + provided diff --git a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/LoginUtils.java b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/LoginUtils.java index 967a311..2f44e14 100644 --- a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/LoginUtils.java +++ b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/LoginUtils.java @@ -2,7 +2,6 @@ package marketing.heyday.hartmann.fotodocumentation.core.utils; import java.nio.charset.Charset; import java.security.Principal; - import java.util.Optional; import org.apache.commons.codec.binary.Base64; @@ -42,14 +41,6 @@ public class LoginUtils { return authenticate(userPass._1, userPass._2); } - public Optional getSecurityToken(HttpServletRequest httpServletRequest) { - Optional headerOpt = extractAuthHeader(httpServletRequest); - if (headerOpt.isPresent() && headerOpt.get().length > 2) { - return Optional.ofNullable(headerOpt.get()[2]); - } - return Optional.empty(); - } - private Optional authenticate(String username, String password) { try { Principal principal = new NamePrincipal(username); diff --git a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResource.java b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResource.java index 4fd6627..3128ab5 100644 --- a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResource.java +++ b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResource.java @@ -55,7 +55,7 @@ public class CustomerPictureResource { Optional identity = loginUtils.authenticate(httpServletRequest); if (identity.isEmpty()) { LOG.debug("identity empty login invalid"); - return Response.status(401).build(); + return Response.status(Status.UNAUTHORIZED).build(); } diff --git a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractRestTest.java b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractRestTest.java index 23f2df4..ff8022a 100644 --- a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractRestTest.java +++ b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractRestTest.java @@ -41,8 +41,7 @@ public abstract class AbstractRestTest extends AbstractTest { protected String getAuthorization(String user, String pass) { String auth = user + ":" + pass; String encoded = Base64.getEncoder().encodeToString(auth.getBytes()); - String authorization = "Basic " + encoded; - return authorization; + return "Basic " + encoded; } protected String getBearerToken(String authorization) { diff --git a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractTest.java b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractTest.java index 4fc7de3..67db0e6 100644 --- a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractTest.java +++ b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractTest.java @@ -31,7 +31,7 @@ import org.skyscreamer.jsonassert.JSONAssert; * created: 13 Nov 2024 */ -public class AbstractTest { +public abstract class AbstractTest { private static final Log LOG = LogFactory.getLog(AbstractTest.class); public String deploymentURL = "http://localhost:8180/"; @@ -179,11 +179,4 @@ public class AbstractTest { throw new RuntimeException(e); } } - - /* - public static void main(String[] args) throws SQLException { - try (var connection = DriverManager.getConnection("jdbc:postgresql://localhost:5432/skillmatrix", "skillmatrix", "skillmatrix")) { - initDb(connection, "dataset.xml"); - } - }*/ }