Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -15,7 +15,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.3.9</version>
+	<version>0.3.10</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/commons/httpserver/accessmanager/HttpAccessManager.java

@@ -171,10 +171,12 @@ private TokenVerifier<AccessToken> persistUserInfoInContext(final Context ctx) {
 			String readTenants = (String) token.getOtherClaims().get("tenants_read");
 			ctx.attribute(Attribute.USER_CLIENT_ATTRIBUTE_TENANTS_READ, readTenants);
 			ctx.attribute(Attribute.USER_TENANTS_READ_SET, createTenantSetFrom(readTenants));
+			ctx.attribute(Attribute.USER_TENANT_READ, getFirstTenantFrom(readTenants));
 
 			String writeTenants = (String) token.getOtherClaims().get("tenants_write");
 			ctx.attribute(Attribute.USER_CLIENT_ATTRIBUTE_TENANTS_WRITE, writeTenants);
 			ctx.attribute(Attribute.USER_TENANTS_WRITE_SET, createTenantSetFrom(writeTenants));
+			ctx.attribute(Attribute.USER_TENANT_WRITE, getFirstTenantFrom(writeTenants));
 
 			Set<String> clientRoles = Set.of();
 			String key = token.getIssuedFor();
@@ -240,6 +242,23 @@ private Object createTenantSetFrom(final String tenant) {
 		return tenantSet;
 	}
 
+	private Long getFirstTenantFrom(final String tenant) {
+		if (tenant == null || tenant.isBlank())
+			return null;
+
+		String[] tenants = tenant.split(",");
+		for (String t : tenants) {
+			if (t.isBlank())
+				continue;
+			try {
+				return Long.parseLong(t.trim());
+			} catch (NumberFormatException e) {
+				// NOOP
+			}
+		}
+		return null;
+	}
+
 	private void setTokenRejectionReason(final Context ctx, final String reason) {
 		ctx.attribute(Attribute.KEYCLOAK_TOKEN_REJECTION_REASON, reason);
 	}

src/main/java/info/unterrainer/commons/httpserver/enums/Attribute.java

@@ -22,6 +22,8 @@ public class Attribute {
 	public static final String USER_CLIENT_ATTRIBUTE_TENANTS_WRITE = "user_client_attribute_tenants_write";
 	public static final String USER_TENANTS_READ_SET = "user_tenant_read_set";
 	public static final String USER_TENANTS_WRITE_SET = "user_tenant_write_set";
+	public static final String USER_TENANT_READ = "user_tenant_read";
+	public static final String USER_TENANT_WRITE = "user_tenant_write";
 
 	public static final String KEYCLOAK_TOKEN_REJECTION_REASON = "kc_token_rejection_reason";
 }

src/main/java/info/unterrainer/commons/httpserver/extensions/AsyncExtensionContextBaseMapper.java

@@ -11,6 +11,8 @@ public AsyncExtensionContext map(final Context ctx, final AsyncExtensionContext
 		asyncCtx.addParameter(ctx, Attribute.USER_CLIENT_ATTRIBUTE_TENANTS_WRITE);
 		asyncCtx.addParameter(ctx, Attribute.USER_TENANTS_READ_SET);
 		asyncCtx.addParameter(ctx, Attribute.USER_TENANTS_WRITE_SET);
+		asyncCtx.addParameter(ctx, Attribute.USER_TENANT_READ);
+		asyncCtx.addParameter(ctx, Attribute.USER_TENANT_WRITE);
 		asyncCtx.addParameter(ctx, Attribute.JAVALIN_SERVER);
 		asyncCtx.addParameter(ctx, Attribute.RESPONSE_OBJECT);
 		asyncCtx.addParameter(ctx, Attribute.RESPONSE_STATUS);