@theia/plugin-ext 1.29.0-next.23 → 1.29.0-next.30

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.29.0-next.23+7cb705b64a3",
+  "version": "1.29.0-next.30+a0e7922bd76",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.29.0-next.23+7cb705b64a3",
-    "@theia/callhierarchy": "1.29.0-next.23+7cb705b64a3",
-    "@theia/console": "1.29.0-next.23+7cb705b64a3",
-    "@theia/core": "1.29.0-next.23+7cb705b64a3",
-    "@theia/debug": "1.29.0-next.23+7cb705b64a3",
-    "@theia/editor": "1.29.0-next.23+7cb705b64a3",
-    "@theia/file-search": "1.29.0-next.23+7cb705b64a3",
-    "@theia/filesystem": "1.29.0-next.23+7cb705b64a3",
-    "@theia/markers": "1.29.0-next.23+7cb705b64a3",
-    "@theia/messages": "1.29.0-next.23+7cb705b64a3",
-    "@theia/monaco": "1.29.0-next.23+7cb705b64a3",
+    "@theia/bulk-edit": "1.29.0-next.30+a0e7922bd76",
+    "@theia/callhierarchy": "1.29.0-next.30+a0e7922bd76",
+    "@theia/console": "1.29.0-next.30+a0e7922bd76",
+    "@theia/core": "1.29.0-next.30+a0e7922bd76",
+    "@theia/debug": "1.29.0-next.30+a0e7922bd76",
+    "@theia/editor": "1.29.0-next.30+a0e7922bd76",
+    "@theia/file-search": "1.29.0-next.30+a0e7922bd76",
+    "@theia/filesystem": "1.29.0-next.30+a0e7922bd76",
+    "@theia/markers": "1.29.0-next.30+a0e7922bd76",
+    "@theia/messages": "1.29.0-next.30+a0e7922bd76",
+    "@theia/monaco": "1.29.0-next.30+a0e7922bd76",
     "@theia/monaco-editor-core": "1.67.2",
-    "@theia/navigator": "1.29.0-next.23+7cb705b64a3",
-    "@theia/output": "1.29.0-next.23+7cb705b64a3",
-    "@theia/plugin": "1.29.0-next.23+7cb705b64a3",
-    "@theia/preferences": "1.29.0-next.23+7cb705b64a3",
-    "@theia/scm": "1.29.0-next.23+7cb705b64a3",
-    "@theia/search-in-workspace": "1.29.0-next.23+7cb705b64a3",
-    "@theia/task": "1.29.0-next.23+7cb705b64a3",
-    "@theia/terminal": "1.29.0-next.23+7cb705b64a3",
-    "@theia/timeline": "1.29.0-next.23+7cb705b64a3",
-    "@theia/variable-resolver": "1.29.0-next.23+7cb705b64a3",
-    "@theia/workspace": "1.29.0-next.23+7cb705b64a3",
+    "@theia/navigator": "1.29.0-next.30+a0e7922bd76",
+    "@theia/output": "1.29.0-next.30+a0e7922bd76",
+    "@theia/plugin": "1.29.0-next.30+a0e7922bd76",
+    "@theia/preferences": "1.29.0-next.30+a0e7922bd76",
+    "@theia/scm": "1.29.0-next.30+a0e7922bd76",
+    "@theia/search-in-workspace": "1.29.0-next.30+a0e7922bd76",
+    "@theia/task": "1.29.0-next.30+a0e7922bd76",
+    "@theia/terminal": "1.29.0-next.30+a0e7922bd76",
+    "@theia/timeline": "1.29.0-next.30+a0e7922bd76",
+    "@theia/variable-resolver": "1.29.0-next.30+a0e7922bd76",
+    "@theia/workspace": "1.29.0-next.30+a0e7922bd76",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
     "escape-html": "^1.0.3",
@@ -94,5 +94,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7cb705b64a387bbf582c455365a1fa453ea301bf"
+  "gitHead": "a0e7922bd76160d0d29564ec1316f82dc021af3f"
 }

package/src/common/plugin-api-rpc.ts

@@ -1943,20 +1943,15 @@ export interface AuthenticationExt {
     $getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<theia.AuthenticationSession>>;
     $createSession(id: string, scopes: string[]): Promise<theia.AuthenticationSession>;
     $removeSession(id: string, sessionId: string): Promise<void>;
-    $onDidChangeAuthenticationSessions(id: string, label: string): Promise<void>;
-    $onDidChangeAuthenticationProviders(added: theia.AuthenticationProviderInformation[], removed: theia.AuthenticationProviderInformation[]): Promise<void>;
-    $setProviders(providers: theia.AuthenticationProviderInformation[]): Promise<void>;
+    $onDidChangeAuthenticationSessions(provider: theia.AuthenticationProviderInformation): Promise<void>;
 }
 
 export interface AuthenticationMain {
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): void;
     $unregisterAuthenticationProvider(id: string): void;
-    $getProviderIds(): Promise<string[]>;
-    $ensureProvider(id: string): Promise<void>;
-    $sendDidChangeSessions(providerId: string, event: AuthenticationProviderAuthenticationSessionsChangeEvent): void;
+    $onDidChangeSessions(providerId: string, event: AuthenticationProviderAuthenticationSessionsChangeEvent): void;
     $getSession(providerId: string, scopes: readonly string[], extensionId: string, extensionName: string,
         options: theia.AuthenticationGetSessionOptions): Promise<theia.AuthenticationSession | undefined>;
-    $removeSession(providerId: string, sessionId: string): Promise<void>;
 }
 
 export interface RawColorInfo {

package/src/main/browser/authentication-main.ts

@@ -21,7 +21,7 @@
 // code copied and modified from https://github.com/microsoft/vscode/blob/1.47.3/src/vs/workbench/api/browser/mainThreadAuthentication.ts
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { AuthenticationExt, AuthenticationMain, PluginManagerExt, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
+import { AuthenticationExt, AuthenticationMain, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Dialog, StorageService } from '@theia/core/lib/browser';
@@ -43,28 +43,17 @@ export class AuthenticationMainImpl implements AuthenticationMain {
     private readonly storageService: StorageService;
     private readonly authenticationService: AuthenticationService;
     private readonly quickPickService: QuickPickService;
-    private readonly extensionService: PluginManagerExt;
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.AUTHENTICATION_EXT);
         this.messageService = container.get(MessageService);
         this.storageService = container.get(StorageService);
         this.authenticationService = container.get(AuthenticationService);
         this.quickPickService = container.get(QuickPickService);
-        this.extensionService = rpc.getProxy(MAIN_RPC_CONTEXT.HOSTED_PLUGIN_MANAGER_EXT);
 
         this.authenticationService.onDidChangeSessions(e => {
-            this.proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
-        });
-        this.authenticationService.onDidRegisterAuthenticationProvider(info => {
-            this.proxy.$onDidChangeAuthenticationProviders([info], []);
-        });
-        this.authenticationService.onDidUnregisterAuthenticationProvider(providerId => {
-            this.proxy.$onDidChangeAuthenticationProviders([], [providerId]);
+            this.proxy.$onDidChangeAuthenticationSessions({ id: e.providerId, label: e.label });
         });
     }
-    $getProviderIds(): Promise<string[]> {
-        return Promise.resolve(this.authenticationService.getProviderIds());
-    }
 
     async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
         const provider = new AuthenticationProviderImpl(this.proxy, id, label, supportsMultipleAccounts, this.storageService, this.messageService);
@@ -230,15 +219,7 @@ export class AuthenticationMainImpl implements AuthenticationMain {
         this.storageService.setData(`authentication-session-${extensionName}-${providerId}`, sessionId);
     }
 
-    $ensureProvider(id: string): Promise<void> {
-        return this.extensionService.$activateByEvent(getAuthenticationProviderActivationEvent(id));
-    }
-
-    $removeSession(providerId: string, sessionId: string): Promise<void> {
-        return this.authenticationService.logout(providerId, sessionId);
-    }
-
-    $sendDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
+    $onDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
         this.authenticationService.updateSessions(providerId, event);
     }
 }
@@ -272,8 +253,10 @@ interface AccountUsage {
 }
 
 export class AuthenticationProviderImpl implements AuthenticationProvider {
-    private accounts = new Map<string, string[]>(); // Map account name to session ids
-    private sessions = new Map<string, string>(); // Map account id to name
+    /** 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>;
 
@@ -313,7 +296,7 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
             Dialog.CANCEL);
 
         if (result && result === nls.localizeByDefault('Sign Out') && sessionsForAccount) {
-            sessionsForAccount.forEach(sessionId => this.logout(sessionId));
+            sessionsForAccount.forEach(sessionId => this.removeSession(sessionId));
             removeAccountUsage(this.storageService, this.id, accountName);
         }
     }
@@ -325,10 +308,10 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
     async updateSessionItems(event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): Promise<void> {
         const { added, removed } = event;
         const session = await this.proxy.$getSessions(this.id);
-        const addedSessions = session.filter(s => added.some(addedSession => this.getSessionId(addedSession) === s.id));
+        const addedSessions = added ? session.filter(s => added.some(addedSession => addedSession.id === s.id)) : [];
 
-        removed.forEach(removedSession => {
-            const sessionId = this.getSessionId(removedSession);
+        removed?.forEach(removedSession => {
+            const sessionId = removedSession.id;
             if (sessionId) {
                 const accountName = this.sessions.get(sessionId);
                 if (accountName) {
@@ -347,29 +330,21 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
         addedSessions.forEach(s => this.registerSession(s));
     }
 
-    login(scopes: string[]): Promise<theia.AuthenticationSession> {
-        return this.proxy.$createSession(this.id, scopes);
+    async login(scopes: string[]): Promise<theia.AuthenticationSession> {
+        return this.createSession(scopes);
     }
 
     async logout(sessionId: string): Promise<void> {
-        await this.proxy.$removeSession(this.id, sessionId);
-        this.messageService.info('Successfully signed out.');
+        return this.removeSession(sessionId);
     }
 
     createSession(scopes: string[]): Thenable<theia.AuthenticationSession> {
-        return this.login(scopes);
+        return this.proxy.$createSession(this.id, scopes);
     }
 
     removeSession(sessionId: string): Thenable<void> {
-        return this.logout(sessionId);
-    }
-
-    // utility method to be backwards compatible with the old AuthenticationProviderAuthenticationSessionsChangeEvent containing only the session id string
-    private getSessionId(obj: string | theia.AuthenticationSession | undefined): string | undefined {
-        if (!obj || typeof obj === 'string') {
-            return obj;
-        }
-        return obj.id;
+        return this.proxy.$removeSession(this.id, sessionId)
+            .then(() => { this.messageService.info('Successfully signed out.'); });
     }
 }
 

package/src/main/browser/view/plugin-view-registry.ts

@@ -490,7 +490,6 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         const currentDataWidget = widget.widgets[0];
         const viewDataWidget = await this.createViewDataWidget(view.id, webviewId);
         if (widget.isDisposed) {
-            // eslint-disable-next-line no-unused-expressions
             viewDataWidget?.dispose();
             return;
         }

package/src/plugin/authentication-ext.ts

@@ -34,13 +34,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
     private proxy: AuthenticationMain;
     private authenticationProviders: Map<string, theia.AuthenticationProvider> = new Map<string, theia.AuthenticationProvider>();
 
-    private _providerIds: string[] = [];
-
-    private _providers: theia.AuthenticationProviderInformation[] = [];
-
-    private onDidChangeAuthenticationProvidersEmitter = new Emitter<theia.AuthenticationProvidersChangeEvent>();
-    readonly onDidChangeAuthenticationProviders: Event<theia.AuthenticationProvidersChangeEvent> = this.onDidChangeAuthenticationProvidersEmitter.event;
-
     private onDidChangeSessionsEmitter = new Emitter<theia.AuthenticationSessionsChangeEvent>();
     readonly onDidChangeSessions: Event<theia.AuthenticationSessionsChangeEvent> = this.onDidChangeSessionsEmitter.event;
 
@@ -48,18 +41,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.AUTHENTICATION_MAIN);
     }
 
-    getProviderIds(): Promise<ReadonlyArray<string>> {
-        return this.proxy.$getProviderIds();
-    }
-
-    get providerIds(): string[] {
-        return this._providerIds;
-    }
-
-    get providers(): ReadonlyArray<theia.AuthenticationProviderInformation> {
-        return Object.freeze(this._providers.slice());
-    }
-
     async getSession(requestingExtension: InternalPlugin, providerId: string, scopes: readonly string[],
         options: theia.AuthenticationGetSessionOptions & ({ createIfNone: true } | { forceNewSession: true } | { forceNewSession: { detail: string } })):
         Promise<theia.AuthenticationSession>;
@@ -76,29 +57,14 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         return this.proxy.$getSession(providerId, scopes, extensionId, extensionName, options);
     }
 
-    async logout(providerId: string, sessionId: string): Promise<void> {
-        return this.proxy.$removeSession(providerId, sessionId);
-    }
-
     registerAuthenticationProvider(id: string, label: string, provider: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions): theia.Disposable {
         if (this.authenticationProviders.get(id)) {
             throw new Error(`An authentication provider with id '${id}' is already registered.`);
         }
 
         this.authenticationProviders.set(id, provider);
-        if (this._providerIds.indexOf(id) === -1) {
-            this._providerIds.push(id);
-        }
-
-        if (!this._providers.find(p => p.id === id)) {
-            this._providers.push({
-                id,
-                label
-            });
-        }
-
         const listener = provider.onDidChangeSessions(e => {
-            this.proxy.$sendDidChangeSessions(id, e);
+            this.proxy.$onDidChangeSessions(id, e);
         });
 
         this.proxy.$registerAuthenticationProvider(id, label, !!options?.supportsMultipleAccounts);
@@ -106,16 +72,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         return new Disposable(() => {
             listener.dispose();
             this.authenticationProviders.delete(id);
-            const index = this._providerIds.findIndex(pid => id === pid);
-            if (index > -1) {
-                this._providerIds.splice(index);
-            }
-
-            const i = this._providers.findIndex(p => p.id === id);
-            if (i > -1) {
-                this._providers.splice(i);
-            }
-
             this.proxy.$unregisterAuthenticationProvider(id);
         });
     }
@@ -163,30 +119,7 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
     }
 
-    $onDidChangeAuthenticationSessions(id: string, label: string): Promise<void> {
-        this.onDidChangeSessionsEmitter.fire({ provider: { id, label } });
-        return Promise.resolve();
-    }
-
-    async $onDidChangeAuthenticationProviders(added: theia.AuthenticationProviderInformation[], removed: theia.AuthenticationProviderInformation[]): Promise<void> {
-        added.forEach(id => {
-            if (this._providers.indexOf(id) === -1) {
-                this._providers.push(id);
-            }
-        });
-
-        removed.forEach(p => {
-            const index = this._providers.findIndex(provider => provider.id === p.id);
-            if (index > -1) {
-                this._providers.splice(index);
-            }
-        });
-
-        this.onDidChangeAuthenticationProvidersEmitter.fire({ added, removed });
-    }
-
-    $setProviders(providers: theia.AuthenticationProviderInformation[]): Promise<void> {
-        this._providers.push(...providers);
-        return Promise.resolve(undefined);
+    async $onDidChangeAuthenticationSessions(provider: theia.AuthenticationProviderInformation): Promise<void> {
+        this.onDidChangeSessionsEmitter.fire({ provider });
     }
 }

package/src/plugin/plugin-context.ts

@@ -224,50 +224,14 @@ export function createAPIFactory(
 
     return function (plugin: InternalPlugin): typeof theia {
         const authentication: typeof theia.authentication = {
-            // support older (< 1.53.0) and newer version of authentication provider registration
-            registerAuthenticationProvider(
-                id: string | theia.AuthenticationProvider, label?: string, provider?: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions):
-                theia.Disposable {
-                // collect registration data based on registration type: new (all parameters given) vs old (data stored in provider)
-                const isNewRegistration = typeof id === 'string';
-                const regProvider = isNewRegistration ? provider! : id;
-                const regId = isNewRegistration ? id : regProvider.id;
-                const regLabel = isNewRegistration ? label! : regProvider.label;
-                const regOptions = isNewRegistration ? options : { supportsMultipleAccounts: regProvider.supportsMultipleAccounts };
-
-                // ensure that all methods of the new AuthenticationProvider are available or delegate otherwise
-                if (!regProvider['createSession']) {
-                    regProvider['createSession'] = (scopes: string[]) => regProvider.login(scopes);
-                }
-                if (!regProvider['removeSession']) {
-                    regProvider['removeSession'] = (sessionId: string) => regProvider.logout(sessionId);
-                }
-                return authenticationExt.registerAuthenticationProvider(regId, regLabel, regProvider, regOptions);
-            },
-            get onDidChangeAuthenticationProviders(): theia.Event<theia.AuthenticationProvidersChangeEvent> {
-                return authenticationExt.onDidChangeAuthenticationProviders;
-            },
-            getProviderIds(): Thenable<ReadonlyArray<string>> {
-                return Promise.resolve(authenticationExt.providerIds);
-            },
-            get providerIds(): string[] {
-                return authenticationExt.providerIds;
-            },
-            get providers(): ReadonlyArray<theia.AuthenticationProviderInformation> {
-                return authenticationExt.providers;
+            registerAuthenticationProvider(id: string, label: string, provider: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions): theia.Disposable {
+                return authenticationExt.registerAuthenticationProvider(id, label, provider, options);
             },
             getSession(providerId: string, scopes: string[], options: theia.AuthenticationGetSessionOptions) {
                 return authenticationExt.getSession(plugin, providerId, scopes, options as any);
             },
-            logout(providerId: string, sessionId: string): Thenable<void> {
-                return authenticationExt.logout(providerId, sessionId);
-            },
             get onDidChangeSessions(): theia.Event<theia.AuthenticationSessionsChangeEvent> {
                 return authenticationExt.onDidChangeSessions;
-            },
-            async hasSession(providerId: string, scopes: readonly string[]): Promise<boolean> {
-                const session = await authenticationExt.getSession(plugin, providerId, scopes, { silent: true });
-                return !!session;
             }
         };
         const commands: typeof theia.commands = {

package/src/plugin/preference-registry.spec.ts

@@ -112,7 +112,6 @@ describe('PreferenceRegistryExtImpl:', () => {
         });
     });
 
-    /* eslint-disable no-unused-expressions */
     describe('toConfigurationChangeEvent', () => {
         // E.g. deletion of a `tasks.json`.
         it('Handles deletion of a section', () => {