update

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-server</artifactId>
-	<version>1.0.17</version>
+	<version>1.0.18</version>
 	<name>WebsocketServer</name>
 	<packaging>jar</packaging>
 
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>oauth-token-manager</artifactId>
-			<version>1.0.10</version>
+			<version>1.0.11</version>
 		</dependency>
 	</dependencies>
 

src/main/java/info/unterrainer/websocketserver/WsOauthHandlerBase.java

@@ -136,12 +136,12 @@ public final void onMessage(WsMessageContext ctx) throws Exception {
 				String tenantId = tokenHandler.checkAccess(ctx.message());
 				tenantIdsBySession.put(ctx.session, tenantId);
 				WsConnectContext client = getQuarantinedClient(ctx.session);
-				log.debug("(" + name + ") Client [{}] passed token validation. Moving from quarantine to connected.",
-						ctx.session.getRemoteAddress());
 				clientsQuarantined.removeIf(c -> c.session.equals(ctx.session));
 				clientsConnected.add(client);
+				log.debug("(" + name + ") Client [{}] passed token validation. Moving from quarantine to connected.",
+						ctx.session.getRemoteAddress());
 				return;
-			} catch (Exception e) {
+			} catch (Throwable e) {
 				log.debug("(" + name + ") Token validation failed for client [{}]. Disconnecting.",
 						ctx.session.getRemoteAddress(), e);
 				ctx.session.close(1000, "(" + name + ") Unauthorized access with invalid token");

src/test/java/info/unterrainer/websocketserver/AiComm.java

@@ -7,6 +7,10 @@
 @Slf4j
 public class AiComm extends WsOauthHandlerBase {
 
+	public AiComm(String name) {
+		super(name);
+	}
+
 	@Override
 	public void onMsg(WsMessageContext ctx) throws Exception {
 		super.onMsg(ctx);

src/test/java/info/unterrainer/websocketserver/WebSocketServerTest.java

@@ -6,7 +6,7 @@ public static void main(String[] args) {
 		WebsocketServer server = new WebsocketServer("https://keycloak.lan.elite-zettl.at", "Cms");
 		AiComm aiComm;
 
-		aiComm = new AiComm();
+		aiComm = new AiComm("ai-comm-test");
 
 		server.wsOauth("/jwt", aiComm);
 		server.ws("/ws", ws -> {