Add auth state dedup logic

aws · Jan 22, 2025 · a316ac0 · a316ac0
1 parent dc8b198
commit a316ac0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java
@@ -122,7 +122,7 @@ private <T, R> void processQueuedEvents(final String interestId, final Class<R>
 
                 List<R> eventBatchQueue = new ArrayList<>(EVENT_BATCH_SIZE);
 
-                while (eventQueue.drainTo(eventBatchQueue) > 0) {
+                while (eventQueue.drainTo(eventBatchQueue, EVENT_BATCH_SIZE) > 0) {
                     for (R newEvent : eventBatchQueue) {
                         try {
                             eventCallback.callWith(newEvent);

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/DefaultAuthStateManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/DefaultAuthStateManager.java
@@ -42,8 +42,10 @@ public final class DefaultAuthStateManager implements AuthStateManager {
     private LoginParams loginParams; // used in login's getSsoToken params
     private String issuerUrl; // used in AmazonQLspClientImpl.getConnectionMetadata()
     private String ssoTokenId; // used in logout's invalidateSsoToken params
+    private AuthState previousAuthState;
 
     public DefaultAuthStateManager(final PluginStore pluginStore) {
+        previousAuthState = null;
         this.authPluginStore = new AuthPluginStore(pluginStore);
         syncAuthStateWithPluginStore();
     }
@@ -120,7 +122,12 @@ private void updateState(final AuthStateType authStatusType, final LoginType log
          * This notification is critical for ensuring all plugin components reflect the current
          * authentication state.
          */
-        EventBroker.getInstance().post(getAuthState());
+        AuthState currentAuthState = getAuthState();
+        if (!currentAuthState.equals(previousAuthState)) {
+            EventBroker.getInstance().post(getAuthState());
+            previousAuthState = currentAuthState;
+        }
+
     }
 
     private void syncAuthStateWithPluginStore() {