Fix authentication session event chain (#16915)

Author: colin-grant-work

packages/plugin-ext/src/main/browser/authentication-main.ts

@@ -25,6 +25,8 @@ import { AuthenticationExt, AuthenticationMain, MAIN_RPC_CONTEXT } from '../../c
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { ConfirmDialog, Dialog, StorageService } from '@theia/core/lib/browser';
+import { Disposable } from '@theia/core/lib/common/disposable';
+import { Emitter, Event } from '@theia/core/lib/common/event';
 import {
     AuthenticationProvider,
     AuthenticationProviderSessionOptions,
@@ -47,6 +49,7 @@ export class AuthenticationMainImpl implements AuthenticationMain {
     private readonly storageService: StorageService;
     private readonly authenticationService: AuthenticationService;
     private readonly quickPickService: QuickPickService;
+    private readonly providers: Map<string, AuthenticationProviderImpl> = new Map();
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.AUTHENTICATION_EXT);
         this.messageService = container.get(MessageService);
@@ -61,11 +64,15 @@ export class AuthenticationMainImpl implements AuthenticationMain {
 
     async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
         const provider = new AuthenticationProviderImpl(this.proxy, id, label, supportsMultipleAccounts, this.storageService, this.messageService);
+        this.providers.set(id, provider);
         this.authenticationService.registerAuthenticationProvider(id, provider);
     }
 
     async $unregisterAuthenticationProvider(id: string): Promise<void> {
         this.authenticationService.unregisterAuthenticationProvider(id);
+        const provider = this.providers.get(id);
+        provider?.dispose();
+        this.providers.delete(id);
     }
 
     async $updateSessions(id: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): Promise<void> {
@@ -248,7 +255,12 @@ export class AuthenticationMainImpl implements AuthenticationMain {
     }
 
     $onDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
-        this.authenticationService.updateSessions(providerId, event);
+        const provider = this.providers.get(providerId);
+        if (provider) {
+            provider.fireSessionsChanged(event);
+        } else {
+            console.warn(`No authentication provider found for id '${providerId}' when firing session change event.`);
+        }
     }
 }
 
@@ -284,13 +296,14 @@ interface AccountUsage {
     lastUsed: number;
 }
 
-export class AuthenticationProviderImpl implements AuthenticationProvider {
+export class AuthenticationProviderImpl implements AuthenticationProvider, Disposable {
     /** map from account name to session ids */
     private accounts = new Map<string, string[]>();
     /** map from session id to account name */
     private sessions = new Map<string, string>();
 
-    readonly onDidChangeSessions: theia.Event<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>;
+    private readonly onDidChangeSessionsEmitter = new Emitter<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>();
+    readonly onDidChangeSessions: Event<theia.AuthenticationProviderAuthenticationSessionsChangeEvent> = this.onDidChangeSessionsEmitter.event;
 
     constructor(
         private readonly proxy: AuthenticationExt,
@@ -301,6 +314,14 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
         private readonly messageService: MessageService
     ) { }
 
+    dispose(): void {
+        this.onDidChangeSessionsEmitter.dispose();
+    }
+
+    fireSessionsChanged(event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
+        this.onDidChangeSessionsEmitter.fire(event);
+    }
+
     public hasSessions(): boolean {
         return !!this.sessions.size;
     }