Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

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

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

@@ -194,7 +194,8 @@ private TokenVerifier<AccessToken> persistUserInfoInContext(final Context ctx) {
 						.email(token.getEmail())
 						.emailVerified(token.getEmailVerified())
 						.realmRoles(token.getRealmAccess().getRoles())
-						.tenant(readTenants)
+						.readTenants(readTenants)
+						.writeTenants(writeTenants)
 						.clientRoles(clientRoles)
 						.isActive(token.isActive())
 						.isBearer(token.getType().equalsIgnoreCase("bearer"))

src/main/java/info/unterrainer/commons/httpserver/jsons/UserDataJson.java

@@ -23,11 +23,13 @@ public class UserDataJson {
 	private Set<String> realmRoles;
 	private Set<String> clientRoles;
 	/**
-	 * Is the custom Keycloak-attribute 'tenant' that has to be set under
-	 * user/attributes within Keycloak and then mapped using an AttributeMapper
-	 * within Keycloak as well. Is a comma-separated list of tenant-IDs.
+	 * Custom Keycloak-attributes 'tenant_read' and 'tenant_write' that have to be
+	 * set under user/attributes within Keycloak and then mapped using an
+	 * AttributeMapper within Keycloak as well. Are comma-separated lists of
+	 * tenant-IDs.
 	 */
-	private String tenant;
+	private String readTenants;
+	private String writeTenants;
 
 	private boolean isActive;
 	private boolean isBearer;