@codingame/monaco-vscode-authentication-service-override 18.3.1 → 19.0.0

package/index.js

@@ -10,6 +10,9 @@ import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscod
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
 import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service';
 import { DynamicAuthenticationProviderStorageService } from './vscode/src/vs/workbench/services/authentication/browser/dynamicAuthenticationProviderStorageService.js';
+import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
+import { AuthenticationQueryService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationQueryService.js';
+import './vscode/src/vs/workbench/contrib/authentication/browser/authentication.contribution.js';
 
 function getServiceOverride() {
     return {
@@ -17,7 +20,8 @@ function getServiceOverride() {
         [IAuthenticationAccessService.toString()]: new SyncDescriptor(AuthenticationAccessService, [], true),
         [IAuthenticationExtensionsService.toString()]: new SyncDescriptor(AuthenticationExtensionsService, [], true),
         [IAuthenticationUsageService.toString()]: new SyncDescriptor(AuthenticationUsageService, [], true),
-        [IDynamicAuthenticationProviderStorageService.toString()]: new SyncDescriptor(DynamicAuthenticationProviderStorageService, [], true)
+        [IDynamicAuthenticationProviderStorageService.toString()]: new SyncDescriptor(DynamicAuthenticationProviderStorageService, [], true),
+        [IAuthenticationQueryService.toString()]: new SyncDescriptor(AuthenticationQueryService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "18.3.1",
+  "version": "19.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - authentication service-override",
   "keywords": [],
@@ -15,9 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.3.1",
-    "@codingame/monaco-vscode-api": "18.3.1",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "18.3.1"
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.0.0",
+    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "19.0.0",
+    "@codingame/monaco-vscode-api": "19.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "19.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.d.ts

@@ -0,0 +1,6 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ManageAccountPreferencesForExtensionAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, extensionId?: string, providerId?: string): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.js

@@ -0,0 +1,171 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+
+class ManageAccountPreferencesForExtensionAction extends Action2 {
+    constructor() {
+        super({
+            id: '_manageAccountPreferencesForExtension',
+            title: ( localize2(4280, "Manage Extension Account Preferences")),
+            category: ( localize2(4281, "Accounts")),
+            f1: false
+        });
+    }
+    run(accessor, extensionId, providerId) {
+        return accessor.get(IInstantiationService).createInstance(ManageAccountPreferenceForExtensionActionImpl).run(extensionId, providerId);
+    }
+}
+let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenceForExtensionActionImpl {
+    constructor(_authenticationService, _quickInputService, _dialogService, _authenticationQueryService, _extensionService, _logService) {
+        this._authenticationService = _authenticationService;
+        this._quickInputService = _quickInputService;
+        this._dialogService = _dialogService;
+        this._authenticationQueryService = _authenticationQueryService;
+        this._extensionService = _extensionService;
+        this._logService = _logService;
+    }
+    async run(extensionId, providerId) {
+        if (!extensionId) {
+            return;
+        }
+        const extension = await this._extensionService.getExtension(extensionId);
+        if (!extension) {
+            throw ( new Error(`No extension with id ${extensionId}`));
+        }
+        if (!providerId) {
+            const extensionQuery = this._authenticationQueryService.extension(extensionId);
+            const providersWithAccess = await extensionQuery.getProvidersWithAccess();
+            if (!providersWithAccess.length) {
+                await this._dialogService.info(( localize(4282, "This extension has not used any accounts yet.")));
+                return;
+            }
+            providerId = providersWithAccess[0];
+            if (providersWithAccess.length > 1) {
+                const result = await this._quickInputService.pick(( providersWithAccess.map(providerId => ({
+                    label: this._authenticationService.getProvider(providerId).label,
+                    id: providerId,
+                }))), {
+                    placeHolder: ( localize(
+                        4283,
+                        "Select an authentication provider to manage account preferences for"
+                    )),
+                    title: ( localize(4284, "Manage Extension Account Preferences"))
+                });
+                if (!result) {
+                    return;
+                }
+                providerId = result.id;
+            }
+        }
+        const accounts = await this._authenticationService.getAccounts(providerId);
+        const currentAccountNamePreference = this._authenticationQueryService.provider(providerId).extension(extensionId).getPreferredAccount();
+        const items = this._getItems(accounts, providerId, currentAccountNamePreference);
+        const provider = this._authenticationService.getProvider(providerId);
+        if (provider.supportsMultipleAccounts) {
+            const lastUsedScopes = accounts
+                .flatMap(account => this._authenticationQueryService.provider(providerId).account(account.label).extension(extensionId).getUsage())
+                .sort((a, b) => b.lastUsed - a.lastUsed)[0]?.scopes;
+            if (lastUsedScopes) {
+                items.push({ type: 'separator' });
+                items.push({
+                    providerId,
+                    scopes: lastUsedScopes,
+                    label: ( localize(4285, "Use a new account...")),
+                });
+            }
+        }
+        const disposables = ( new DisposableStore());
+        const picker = this._createQuickPick(disposables, extensionId, extension.displayName ?? extension.name, provider.label);
+        if (items.length === 0) {
+            disposables.add(this._handleNoAccounts(picker));
+            return;
+        }
+        picker.items = items;
+        picker.show();
+    }
+    _createQuickPick(disposableStore, extensionId, extensionLabel, providerLabel) {
+        const picker = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
+        disposableStore.add(picker.onDidHide(() => {
+            disposableStore.dispose();
+        }));
+        picker.placeholder = ( localize(
+            4286,
+            "Manage '{0}' account preferences for {1}...",
+            extensionLabel,
+            providerLabel
+        ));
+        picker.title = ( localize(4287, "'{0}' Account Preferences For This Workspace", extensionLabel));
+        picker.sortByLabel = false;
+        disposableStore.add(picker.onDidAccept(async () => {
+            picker.hide();
+            await this._accept(extensionId, picker.selectedItems);
+        }));
+        return picker;
+    }
+    _getItems(accounts, providerId, currentAccountNamePreference) {
+        return (accounts.map(a => currentAccountNamePreference === a.label
+            ? {
+                label: a.label,
+                account: a,
+                providerId,
+                description: ( localize(4288, "Current account")),
+                picked: true
+            }
+            : {
+                label: a.label,
+                account: a,
+                providerId,
+            }));
+    }
+    _handleNoAccounts(picker) {
+        picker.validationMessage = ( localize(4289, "No accounts are currently used by this extension."));
+        picker.buttons = [this._quickInputService.backButton];
+        picker.show();
+        return Event.filter(picker.onDidTriggerButton, (e) => e === this._quickInputService.backButton)(() => this.run());
+    }
+    async _accept(extensionId, selectedItems) {
+        for (const item of selectedItems) {
+            let account;
+            if (!item.account) {
+                try {
+                    const session = await this._authenticationService.createSession(item.providerId, [...item.scopes]);
+                    account = session.account;
+                }
+                catch (e) {
+                    this._logService.error(e);
+                    continue;
+                }
+            }
+            else {
+                account = item.account;
+            }
+            const providerId = item.providerId;
+            const extensionQuery = this._authenticationQueryService.provider(providerId).extension(extensionId);
+            const currentAccountName = extensionQuery.getPreferredAccount();
+            if (currentAccountName === account.label) {
+                continue;
+            }
+            extensionQuery.setPreferredAccount(account);
+        }
+    }
+};
+ManageAccountPreferenceForExtensionActionImpl = ( __decorate([
+    ( __param(0, IAuthenticationService)),
+    ( __param(1, IQuickInputService)),
+    ( __param(2, IDialogService)),
+    ( __param(3, IAuthenticationQueryService)),
+    ( __param(4, IExtensionService)),
+    ( __param(5, ILogService))
+], ManageAccountPreferenceForExtensionActionImpl));
+
+export { ManageAccountPreferencesForExtensionAction };

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForMcpServerAction.d.ts

@@ -0,0 +1,6 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ManageAccountPreferencesForMcpServerAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, mcpServerId?: string, providerId?: string): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForMcpServerAction.js

@@ -0,0 +1,171 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
+import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+
+class ManageAccountPreferencesForMcpServerAction extends Action2 {
+    constructor() {
+        super({
+            id: '_manageAccountPreferencesForMcpServer',
+            title: ( localize2(4290, "Manage MCP Server Account Preferences")),
+            category: ( localize2(4291, "Accounts")),
+            f1: false
+        });
+    }
+    run(accessor, mcpServerId, providerId) {
+        return accessor.get(IInstantiationService).createInstance(ManageAccountPreferenceForMcpServerActionImpl).run(mcpServerId, providerId);
+    }
+}
+let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenceForMcpServerActionImpl {
+    constructor(_authenticationService, _quickInputService, _dialogService, _authenticationQueryService, _mcpService, _logService) {
+        this._authenticationService = _authenticationService;
+        this._quickInputService = _quickInputService;
+        this._dialogService = _dialogService;
+        this._authenticationQueryService = _authenticationQueryService;
+        this._mcpService = _mcpService;
+        this._logService = _logService;
+    }
+    async run(mcpServerId, providerId) {
+        if (!mcpServerId) {
+            return;
+        }
+        const mcpServer = this._mcpService.servers.get().find(s => s.definition.id === mcpServerId);
+        if (!mcpServer) {
+            throw ( new Error(`No MCP server with id ${mcpServerId}`));
+        }
+        if (!providerId) {
+            const mcpServerQuery = this._authenticationQueryService.mcpServer(mcpServerId);
+            const providersWithAccess = await mcpServerQuery.getProvidersWithAccess();
+            if (!providersWithAccess.length) {
+                await this._dialogService.info(( localize(4292, "This MCP server has not used any accounts yet.")));
+                return;
+            }
+            providerId = providersWithAccess[0];
+            if (providersWithAccess.length > 1) {
+                const result = await this._quickInputService.pick(( providersWithAccess.map(providerId => ({
+                    label: this._authenticationService.getProvider(providerId).label,
+                    id: providerId,
+                }))), {
+                    placeHolder: ( localize(
+                        4293,
+                        "Select an authentication provider to manage account preferences for"
+                    )),
+                    title: ( localize(4294, "Manage MCP Server Account Preferences"))
+                });
+                if (!result) {
+                    return;
+                }
+                providerId = result.id;
+            }
+        }
+        const accounts = await this._authenticationService.getAccounts(providerId);
+        const currentAccountNamePreference = this._authenticationQueryService.provider(providerId).mcpServer(mcpServerId).getPreferredAccount();
+        const items = this._getItems(accounts, providerId, currentAccountNamePreference);
+        const provider = this._authenticationService.getProvider(providerId);
+        if (provider.supportsMultipleAccounts) {
+            const lastUsedScopes = accounts
+                .flatMap(account => this._authenticationQueryService.provider(providerId).account(account.label).mcpServer(mcpServerId).getUsage())
+                .sort((a, b) => b.lastUsed - a.lastUsed)[0]?.scopes;
+            if (lastUsedScopes) {
+                items.push({ type: 'separator' });
+                items.push({
+                    providerId: providerId,
+                    scopes: lastUsedScopes,
+                    label: ( localize(4295, "Use a new account...")),
+                });
+            }
+        }
+        const disposables = ( new DisposableStore());
+        const picker = this._createQuickPick(disposables, mcpServerId, mcpServer.definition.label, provider.label);
+        if (items.length === 0) {
+            disposables.add(this._handleNoAccounts(picker));
+            return;
+        }
+        picker.items = items;
+        picker.show();
+    }
+    _createQuickPick(disposableStore, mcpServerId, mcpServerLabel, providerLabel) {
+        const picker = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
+        disposableStore.add(picker.onDidHide(() => {
+            disposableStore.dispose();
+        }));
+        picker.placeholder = ( localize(
+            4296,
+            "Manage '{0}' account preferences for {1}...",
+            mcpServerLabel,
+            providerLabel
+        ));
+        picker.title = ( localize(4297, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
+        picker.sortByLabel = false;
+        disposableStore.add(picker.onDidAccept(async () => {
+            picker.hide();
+            await this._accept(mcpServerId, picker.selectedItems);
+        }));
+        return picker;
+    }
+    _getItems(accounts, providerId, currentAccountNamePreference) {
+        return (accounts.map(a => currentAccountNamePreference === a.label
+            ? {
+                label: a.label,
+                account: a,
+                providerId,
+                description: ( localize(4298, "Current account")),
+                picked: true
+            }
+            : {
+                label: a.label,
+                account: a,
+                providerId,
+            }));
+    }
+    _handleNoAccounts(picker) {
+        picker.validationMessage = ( localize(4299, "No accounts are currently used by this MCP server."));
+        picker.buttons = [this._quickInputService.backButton];
+        picker.show();
+        return Event.filter(picker.onDidTriggerButton, (e) => e === this._quickInputService.backButton)(() => this.run());
+    }
+    async _accept(mcpServerId, selectedItems) {
+        for (const item of selectedItems) {
+            let account;
+            if (!item.account) {
+                try {
+                    const session = await this._authenticationService.createSession(item.providerId, [...item.scopes]);
+                    account = session.account;
+                }
+                catch (e) {
+                    this._logService.error(e);
+                    continue;
+                }
+            }
+            else {
+                account = item.account;
+            }
+            const providerId = item.providerId;
+            const mcpQuery = this._authenticationQueryService.provider(providerId).mcpServer(mcpServerId);
+            const currentAccountName = mcpQuery.getPreferredAccount();
+            if (currentAccountName === account.label) {
+                continue;
+            }
+            mcpQuery.setPreferredAccount(account);
+        }
+    }
+};
+ManageAccountPreferenceForMcpServerActionImpl = ( __decorate([
+    ( __param(0, IAuthenticationService)),
+    ( __param(1, IQuickInputService)),
+    ( __param(2, IDialogService)),
+    ( __param(3, IAuthenticationQueryService)),
+    ( __param(4, IMcpService)),
+    ( __param(5, ILogService))
+], ManageAccountPreferenceForMcpServerActionImpl));
+
+export { ManageAccountPreferencesForMcpServerAction };

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageDynamicAuthenticationProvidersAction.d.ts

@@ -0,0 +1,7 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class RemoveDynamicAuthenticationProvidersAction extends Action2 {
+    static readonly ID = "workbench.action.removeDynamicAuthenticationProviders";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageDynamicAuthenticationProvidersAction.js

@@ -0,0 +1,76 @@
+
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service';
+import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+
+class RemoveDynamicAuthenticationProvidersAction extends Action2 {
+    static { this.ID = 'workbench.action.removeDynamicAuthenticationProviders'; }
+    constructor() {
+        super({
+            id: RemoveDynamicAuthenticationProvidersAction.ID,
+            title: ( localize2(4300, 'Remove Dynamic Authentication Providers')),
+            category: ( localize2(4301, 'Authentication')),
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const quickInputService = accessor.get(IQuickInputService);
+        const dynamicAuthStorageService = accessor.get(IDynamicAuthenticationProviderStorageService);
+        const authenticationService = accessor.get(IAuthenticationService);
+        const dialogService = accessor.get(IDialogService);
+        const interactedProviders = dynamicAuthStorageService.getInteractedProviders();
+        if (interactedProviders.length === 0) {
+            await dialogService.info(( localize(4302, 'No dynamic authentication providers')), ( localize(4303, 'No dynamic authentication providers have been used yet.')));
+            return;
+        }
+        const items = ( interactedProviders.map(provider => ({
+            label: provider.label,
+            description: ( localize(4304, 'Client ID: {0}', provider.clientId)),
+            provider
+        })));
+        const selected = await quickInputService.pick(items, {
+            placeHolder: ( localize(4305, 'Select a dynamic authentication provider to remove')),
+            canPickMany: true
+        });
+        if (!selected || selected.length === 0) {
+            return;
+        }
+        const providerNames = ( selected.map(item => item.provider.label)).join(', ');
+        const message = selected.length === 1
+            ? ( localize(
+            4306,
+            'Are you sure you want to remove the dynamic authentication provider "{0}"?',
+            providerNames
+        ))
+            : ( localize(
+            4307,
+            'Are you sure you want to remove {0} dynamic authentication providers: {1}?',
+            selected.length,
+            providerNames
+        ));
+        const result = await dialogService.confirm({
+            message,
+            detail: ( localize(
+                4308,
+                'This will remove all stored authentication data for the selected provider(s). You will need to re-authenticate if you use these providers again.'
+            )),
+            primaryButton: ( localize(4309, 'Remove')),
+            type: 'warning'
+        });
+        if (!result.confirmed) {
+            return;
+        }
+        for (const item of selected) {
+            const providerId = item.provider.providerId;
+            if (authenticationService.isAuthenticationProviderRegistered(providerId)) {
+                authenticationService.unregisterAuthenticationProvider(providerId);
+            }
+            await dynamicAuthStorageService.removeDynamicProvider(providerId);
+        }
+    }
+}
+
+export { RemoveDynamicAuthenticationProvidersAction };

package/vscode/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.d.ts

@@ -0,0 +1,9 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ManageTrustedExtensionsForAccountAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, options?: {
+        providerId: string;
+        accountLabel: string;
+    }): Promise<void>;
+}