Fix Oauth token refresh & Quarkus Log exception

quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/OidcProvider.java

@@ -44,11 +44,9 @@ void init(MessagingService service) {
         OidcClient client = getClient();
         Multi.createFrom().ticks().every(duration)
                 .emitOn(Infrastructure.getDefaultWorkerPool())
-                .filter(x -> lastToken == null
-                        || lastToken.getRefreshTokenTimeSkew() == null
-                        || lastToken.isAccessTokenWithinRefreshInterval())
                 .call(() -> {
-                    if (lastToken != null && lastToken.getRefreshToken() != null) {
+                    if (lastToken != null && lastToken.getRefreshToken() != null
+                            && lastToken.isAccessTokenWithinRefreshInterval()) {
                         Log.info("Refreshing access token for Solace connection");
                         return client.refreshTokens(lastToken.getRefreshToken()).invoke(tokens -> lastToken = tokens);
                     } else {
@@ -64,6 +62,7 @@ void init(MessagingService service) {
                 .subscribe().with(x -> {
                     if (service.isConnected()) {
                         service.updateProperty(SCHEME_OAUTH2_ACCESS_TOKEN, lastToken.getAccessToken());
+                        Log.info("Updated Solace Session with latest access token");
                     } else {
                         Log.info("Solace service is not connected, cannot update access token without valid connection");
                     }
@@ -75,8 +74,4 @@ OidcClient getClient() {
                 .orElseGet(clients::getClient);
     }
 
-    public Tokens getLastToken() {
-        return lastToken;
-    }
-
-}
+}

quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java

@@ -1,5 +1,7 @@
 package com.solace.quarkus.runtime;
 
+import static com.solace.messaging.config.SolaceProperties.AuthenticationProperties.SCHEME_OAUTH2_ACCESS_TOKEN;
+
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.Function;
@@ -14,6 +16,7 @@
 import com.solace.quarkus.MessagingServiceClientCustomizer;
 
 import io.quarkus.arc.SyntheticCreationalContext;
+import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 
@@ -71,6 +74,14 @@ public MessagingService apply(SyntheticCreationalContext<MessagingService> conte
                     }
                 });
 
+                // Update access token on reconnect to make sure invalid token is not sent. This can happen when a reconnection happens event before scheduled token expiry.
+                service.addReconnectionAttemptListener(serviceEvent -> {
+                    Log.info("Reconnecting to Solace broker due to " + serviceEvent.getMessage());
+                    if (oidcProvider != null && authScheme != null && "AUTHENTICATION_SCHEME_OAUTH2".equals(authScheme)) {
+                        service.updateProperty(SCHEME_OAUTH2_ACCESS_TOKEN, oidcProvider.getToken().getAccessToken());
+                    }
+                });
+
                 return service.connect();
             }
         };