fix api

Author: guFalcon

pom.xml

@@ -9,8 +9,8 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>Oauth-Token-Manager</artifactId>
-	<version>1.0.0</version>
+	<artifactId>oauth-token-manager</artifactId>
+	<version>1.0.4</version>
 	<name>OauthTokenManager</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/oauthtokenmanager/LocalOauthTokens.java

@@ -0,0 +1,16 @@
+package info.unterrainer.oauthtokenmanager;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode()
+public class LocalOauthTokens {
+
+	private String accessToken;
+	private String refreshToken;
+}

src/main/java/info/unterrainer/oauthtokenmanager/OauthTokenManager.java

@@ -29,9 +29,6 @@
 @RequiredArgsConstructor
 public class OauthTokenManager {
 
-	public String accessToken = null;
-	public String refreshToken = null;
-
 	private final String host;
 	private final String realm;
 
@@ -121,8 +118,10 @@ private TokenVerifier<AccessToken> persistUserInfoInContext(String authorization
 
 		try {
 			TokenVerifier<AccessToken> tokenVerifier = TokenVerifier.create(authorizationHeader, AccessToken.class);
-			AccessToken token = tokenVerifier.getToken();
-			if (!token.isActive()) {
+			RemoteOauthToken remoteAccessToken = RemoteOauthToken.builder()
+					.accessToken(tokenVerifier.getToken())
+					.build();
+			if (!remoteAccessToken.getAccessToken().isActive()) {
 				log.warn("Token is inactive.");
 				return null;
 			}
@@ -139,7 +138,8 @@ private TokenVerifier<AccessToken> persistUserInfoInContext(String authorization
 		}
 	}
 
-	public void getTokensFromCredentials(String clientId, String clientSecret, String username, String password) {
+	public LocalOauthTokens getTokensFromCredentials(String clientId, String clientSecret, String username,
+			String password) {
 		try {
 			String tokenEndpoint = host;
 			if (!tokenEndpoint.endsWith("/"))
@@ -166,13 +166,15 @@ public void getTokensFromCredentials(String clientId, String clientSecret, Strin
 
 			ObjectMapper mapper = new ObjectMapper();
 			JsonNode json = mapper.readTree(response.body());
-			accessToken = json.get("access_token").asText();
-			refreshToken = json.get("refresh_token").asText();
-
 			log.info("Token received successfully.");
 			log.debug("Access token: {}", json.get("access_token").asText());
 			log.debug("Refresh token: {}", json.get("refresh_token").asText());
 
+			return LocalOauthTokens.builder()
+					.accessToken(json.get("access_token").asText())
+					.refreshToken(json.get("refresh_token").asText())
+					.build();
+
 		} catch (Exception e) {
 			log.error("Error obtaining tokens from Keycloak.", e);
 			throw new IllegalStateException("Unable to get token", e);

src/main/java/info/unterrainer/oauthtokenmanager/RemoteOauthToken.java

@@ -0,0 +1,33 @@
+package info.unterrainer.oauthtokenmanager;
+
+import org.keycloak.representations.AccessToken;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Data
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode()
+public class RemoteOauthToken {
+
+	private AccessToken accessToken;
+
+	public Long getRemoteTenantId() {
+		if (accessToken == null)
+			return null;
+		String tenantId = (String) accessToken.getOtherClaims().get("value_tenant");
+		if (tenantId == null || tenantId.isBlank())
+			return null;
+		try {
+			return Long.parseLong(tenantId);
+		} catch (NumberFormatException e) {
+			log.warn("Invalid tenant ID in token: {}", tenantId, e);
+			return null;
+		}
+	}
+}

src/test/java/info/unterrainer/oauthtokenmanager/OauthTokenManagerTest.java

@@ -1,18 +1,4 @@
-package info.unterrainer.websocketserver;
+package info.unterrainer.oauthtokenmanager;
 
-public class WebSocketServerTest {
-
-	public static void main(String[] args) {
-		WebsocketServer server = new WebsocketServer("https://keycloak.lan.elite-zettl.at", "Cms");
-		AiComm aiComm;
-
-		aiComm = new AiComm();
-
-		server.wsOauth("/wss", aiComm);
-		server.ws("/ws", ws -> {
-			ws.onConnect(ctx -> ctx.send("Welcome to our websocket-server!"));
-			ws.onMessage(ctx -> ctx.send("Echo from server: [" + ctx.message() + "]"));
-		});
-		server.start(7070);
-	}
+public class OauthTokenManagerTest {
 }