Merge branch 'master' into develop

Author: Gerald Unterrainer

Diff for: pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.20</version>
+	<version>0.2.21</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

Diff for: src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

@@ -10,12 +10,12 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 
 import info.unterrainer.commons.httpserver.accessmanager.HttpAccessManager;
+import info.unterrainer.commons.httpserver.accessmanager.UserAccessInterceptor;
 import info.unterrainer.commons.httpserver.daos.CoreDaoProvider;
 import info.unterrainer.commons.httpserver.enums.Attribute;
 import info.unterrainer.commons.httpserver.enums.ResponseType;
@@ -28,7 +28,6 @@
 import info.unterrainer.commons.httpserver.handlers.HealthHandler;
 import info.unterrainer.commons.httpserver.handlers.PostmanCollectionHandler;
 import info.unterrainer.commons.httpserver.jsons.MessageJson;
-import info.unterrainer.commons.httpserver.jsons.UserDataJson;
 import info.unterrainer.commons.jreutils.ShutdownHook;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import info.unterrainer.commons.serialization.JsonMapper;
@@ -60,7 +59,7 @@ public class HttpServer {
 	List<String> appVersionFqns;
 	@Getter
 	@Setter
-	private Consumer<UserDataJson> userAccessInterceptor;
+	private UserAccessInterceptor userAccessInterceptor;
 	@Getter
 	@Setter
 	private String enumLookupFqnForInterceptorParser;

Diff for: src/main/java/info/unterrainer/commons/httpserver/accessmanager/HttpAccessManager.java

@@ -10,7 +10,6 @@
 import java.security.PublicKey;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Consumer;
 
 import org.eclipse.jetty.http.HttpHeader;
 import org.keycloak.TokenVerifier;
@@ -183,23 +182,24 @@ private TokenVerifier<AccessToken> persistUserInfoInContext(final Context ctx) {
 				clientRoles = token.getResourceAccess().get(key).getRoles();
 			ctx.attribute(Attribute.USER_CLIENT_ROLES, clientRoles);
 
-			Consumer<UserDataJson> userAccessInterceptor = ((HttpServer) ctx.attribute(Attribute.JAVALIN_SERVER))
+			UserAccessInterceptor userAccessInterceptor = ((HttpServer) ctx.attribute(Attribute.JAVALIN_SERVER))
 					.getUserAccessInterceptor();
 			if (userAccessInterceptor != null)
-				userAccessInterceptor.accept(UserDataJson.builder()
-						.userName(userName)
-						.givenName(token.getGivenName())
-						.client(token.getIssuedFor())
-						.familyName(token.getFamilyName())
-						.email(token.getEmail())
-						.emailVerified(token.getEmailVerified())
-						.realmRoles(token.getRealmAccess().getRoles())
-						.readTenants(readTenants)
-						.writeTenants(writeTenants)
-						.clientRoles(clientRoles)
-						.isActive(token.isActive())
-						.isBearer(token.getType().equalsIgnoreCase("bearer"))
-						.build());
+				userAccessInterceptor.accept(ctx, token,
+						UserDataJson.builder()
+								.userName(userName)
+								.givenName(token.getGivenName())
+								.client(token.getIssuedFor())
+								.familyName(token.getFamilyName())
+								.email(token.getEmail())
+								.emailVerified(token.getEmailVerified())
+								.realmRoles(token.getRealmAccess().getRoles())
+								.readTenants(readTenants)
+								.writeTenants(writeTenants)
+								.clientRoles(clientRoles)
+								.isActive(token.isActive())
+								.isBearer(token.getType().equalsIgnoreCase("bearer"))
+								.build());
 
 			if (!token.isActive()) {
 				setTokenRejectionReason(ctx, "Token is inactive.");

Diff for: src/main/java/info/unterrainer/commons/httpserver/accessmanager/UserAccessInterceptor.java

@@ -0,0 +1,12 @@
+package info.unterrainer.commons.httpserver.accessmanager;
+
+import org.keycloak.representations.AccessToken;
+
+import info.unterrainer.commons.httpserver.jsons.UserDataJson;
+import io.javalin.http.Context;
+
+@FunctionalInterface
+public interface UserAccessInterceptor {
+
+	void accept(Context ctx, AccessToken token, UserDataJson userDataJson);
+}