@codingame/monaco-vscode-authentication-service-override 20.5.0 → 21.0.1

package/index.js

@@ -2,7 +2,7 @@
 import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IAuthenticationExtensionsService, IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
-import { AuthenticationService } from '@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
+import { AuthenticationService } from '@codingame/monaco-vscode-8f0e3e10-3d00-5abd-87f4-e9b3b4384fc6-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { AuthenticationAccessService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationAccessService.js';
 import { AuthenticationUsageService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationUsageService.js';
 import { AuthenticationExtensionsService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "20.5.0",
+  "version": "21.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - authentication service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.5.0",
-    "@codingame/monaco-vscode-api": "20.5.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.5.0",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "20.5.0"
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "21.0.1",
+    "@codingame/monaco-vscode-8f0e3e10-3d00-5abd-87f4-e9b3b4384fc6-common": "21.0.1",
+    "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common": "21.0.1",
+    "@codingame/monaco-vscode-api": "21.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -16,9 +16,9 @@ class ManageAccountPreferencesForExtensionAction extends Action2 {
     constructor() {
         super({
             id: '_manageAccountPreferencesForExtension',
-            title: ( localize2(4321, "Manage Extension Account Preferences")),
-            category: ( localize2(4322, "Accounts")),
-            f1: false
+            title: ( localize2(4337, "Manage Extension Account Preferences")),
+            category: ( localize2(4338, "Accounts")),
+            f1: true
         });
     }
     run(accessor, extensionId, providerId) {
@@ -35,6 +35,19 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
         this._logService = _logService;
     }
     async run(extensionId, providerId) {
+        if (!extensionId) {
+            const extensions = this._extensionService.extensions
+                .filter(ext => this._authenticationQueryService.extension(ext.identifier.value).getAllAccountPreferences().size > 0)
+                .sort((a, b) => (a.displayName ?? a.name).localeCompare((b.displayName ?? b.name)));
+            const result = await this._quickInputService.pick(( extensions.map(ext => ({
+                label: ext.displayName ?? ext.name,
+                id: ext.identifier.value
+            }))), {
+                placeHolder: ( localize(4339, "Select an extension to manage account preferences for")),
+                title: ( localize(4340, "Manage Extension Account Preferences"))
+            });
+            extensionId = result?.id;
+        }
         if (!extensionId) {
             return;
         }
@@ -46,7 +59,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             const extensionQuery = this._authenticationQueryService.extension(extensionId);
             const providersWithAccess = await extensionQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(4323, "This extension has not used any accounts yet.")));
+                await this._dialogService.info(( localize(4341, "This extension has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -56,10 +69,10 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                     id: providerId,
                 }))), {
                     placeHolder: ( localize(
-                        4324,
+                        4342,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(4325, "Manage Extension Account Preferences"))
+                    title: ( localize(4340, "Manage Extension Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -80,7 +93,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(4326, "Use a new account...")),
+                    label: ( localize(4343, "Use a new account...")),
                 });
             }
         }
@@ -99,12 +112,12 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            4327,
+            4344,
             "Manage '{0}' account preferences for {1}...",
             extensionLabel,
             providerLabel
         ));
-        picker.title = ( localize(4328, "'{0}' Account Preferences For This Workspace", extensionLabel));
+        picker.title = ( localize(4345, "'{0}' Account Preferences For This Workspace", extensionLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -118,7 +131,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
                 label: a.label,
                 account: a,
                 providerId,
-                description: ( localize(4329, "Current account")),
+                description: ( localize(4346, "Current account")),
                 picked: true
             }
             : {
@@ -128,7 +141,7 @@ let ManageAccountPreferenceForExtensionActionImpl = class ManageAccountPreferenc
             }));
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(4330, "No accounts are currently used by this extension."));
+        picker.validationMessage = ( localize(4347, "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());

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

@@ -16,8 +16,8 @@ class ManageAccountPreferencesForMcpServerAction extends Action2 {
     constructor() {
         super({
             id: '_manageAccountPreferencesForMcpServer',
-            title: ( localize2(4331, "Manage MCP Server Account Preferences")),
-            category: ( localize2(4332, "Accounts")),
+            title: ( localize2(4348, "Manage MCP Server Account Preferences")),
+            category: ( localize2(4349, "Accounts")),
             f1: false
         });
     }
@@ -46,7 +46,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             const mcpServerQuery = this._authenticationQueryService.mcpServer(mcpServerId);
             const providersWithAccess = await mcpServerQuery.getProvidersWithAccess();
             if (!providersWithAccess.length) {
-                await this._dialogService.info(( localize(4333, "This MCP server has not used any accounts yet.")));
+                await this._dialogService.info(( localize(4350, "This MCP server has not used any accounts yet.")));
                 return;
             }
             providerId = providersWithAccess[0];
@@ -56,10 +56,10 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                     id: providerId,
                 }))), {
                     placeHolder: ( localize(
-                        4334,
+                        4351,
                         "Select an authentication provider to manage account preferences for"
                     )),
-                    title: ( localize(4335, "Manage MCP Server Account Preferences"))
+                    title: ( localize(4352, "Manage MCP Server Account Preferences"))
                 });
                 if (!result) {
                     return;
@@ -80,7 +80,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                 items.push({
                     providerId: providerId,
                     scopes: lastUsedScopes,
-                    label: ( localize(4336, "Use a new account...")),
+                    label: ( localize(4353, "Use a new account...")),
                 });
             }
         }
@@ -99,12 +99,12 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             disposableStore.dispose();
         }));
         picker.placeholder = ( localize(
-            4337,
+            4354,
             "Manage '{0}' account preferences for {1}...",
             mcpServerLabel,
             providerLabel
         ));
-        picker.title = ( localize(4338, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
+        picker.title = ( localize(4355, "'{0}' Account Preferences For This Workspace", mcpServerLabel));
         picker.sortByLabel = false;
         disposableStore.add(picker.onDidAccept(async () => {
             picker.hide();
@@ -118,7 +118,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
                 label: a.label,
                 account: a,
                 providerId,
-                description: ( localize(4339, "Current account")),
+                description: ( localize(4356, "Current account")),
                 picked: true
             }
             : {
@@ -128,7 +128,7 @@ let ManageAccountPreferenceForMcpServerActionImpl = class ManageAccountPreferenc
             }));
     }
     _handleNoAccounts(picker) {
-        picker.validationMessage = ( localize(4340, "No accounts are currently used by this MCP server."));
+        picker.validationMessage = ( localize(4357, "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());

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

@@ -11,8 +11,8 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
     constructor() {
         super({
             id: RemoveDynamicAuthenticationProvidersAction.ID,
-            title: ( localize2(4341, 'Remove Dynamic Authentication Providers')),
-            category: ( localize2(4342, 'Authentication')),
+            title: ( localize2(4358, 'Remove Dynamic Authentication Providers')),
+            category: ( localize2(4359, 'Authentication')),
             f1: true
         });
     }
@@ -23,16 +23,16 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         const interactedProviders = dynamicAuthStorageService.getInteractedProviders();
         if (interactedProviders.length === 0) {
-            await dialogService.info(( localize(4343, 'No dynamic authentication providers')), ( localize(4344, 'No dynamic authentication providers have been used yet.')));
+            await dialogService.info(( localize(4360, 'No dynamic authentication providers')), ( localize(4361, 'No dynamic authentication providers have been used yet.')));
             return;
         }
         const items = ( interactedProviders.map(provider => ({
             label: provider.label,
-            description: ( localize(4345, 'Client ID: {0}', provider.clientId)),
+            description: ( localize(4362, 'Client ID: {0}', provider.clientId)),
             provider
         })));
         const selected = await quickInputService.pick(items, {
-            placeHolder: ( localize(4346, 'Select a dynamic authentication provider to remove')),
+            placeHolder: ( localize(4363, 'Select a dynamic authentication provider to remove')),
             canPickMany: true
         });
         if (!selected || selected.length === 0) {
@@ -41,12 +41,12 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const providerNames = ( selected.map(item => item.provider.label)).join(', ');
         const message = selected.length === 1
             ? ( localize(
-            4347,
+            4364,
             'Are you sure you want to remove the dynamic authentication provider "{0}"?',
             providerNames
         ))
             : ( localize(
-            4348,
+            4365,
             'Are you sure you want to remove {0} dynamic authentication providers: {1}?',
             selected.length,
             providerNames
@@ -54,10 +54,10 @@ class RemoveDynamicAuthenticationProvidersAction extends Action2 {
         const result = await dialogService.confirm({
             message,
             detail: ( localize(
-                4349,
+                4366,
                 '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(4350, 'Remove')),
+            primaryButton: ( localize(4367, 'Remove')),
             type: 'warning'
         });
         if (!result.confirmed) {

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

@@ -18,8 +18,8 @@ class ManageTrustedExtensionsForAccountAction extends Action2 {
     constructor() {
         super({
             id: '_manageTrustedExtensionsForAccount',
-            title: ( localize2(4351, "Manage Trusted Extensions For Account")),
-            category: ( localize2(4352, "Accounts")),
+            title: ( localize2(4368, "Manage Trusted Extensions For Account")),
+            category: ( localize2(4369, "Accounts")),
             f1: true
         });
     }
@@ -57,7 +57,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(4353, "Pick an account to manage trusted extensions for")),
+            placeHolder: ( localize(4370, "Pick an account to manage trusted extensions for")),
             matchOnDescription: true,
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -101,7 +101,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
             };
         }));
         if (!filteredExtensions.length) {
-            this._dialogService.info(( localize(4354, "This account has not been used by any extensions.")));
+            this._dialogService.info(( localize(4371, "This account has not been used by any extensions.")));
             return [];
         }
         const trustedExtensions = filteredExtensions.filter(e => e.trusted);
@@ -109,20 +109,20 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         const sortByLastUsed = (a, b) => (b.lastUsed || 0) - (a.lastUsed || 0);
         return [
             ...( otherExtensions.sort(sortByLastUsed).map(this._toQuickPickItem)),
-            { type: 'separator', label: ( localize(4355, "Trusted by Microsoft")) },
+            { type: 'separator', label: ( localize(4372, "Trusted by Microsoft")) },
             ...( trustedExtensions.sort(sortByLastUsed).map(this._toQuickPickItem))
         ];
     }
     _toQuickPickItem(extension) {
         const lastUsed = extension.lastUsed;
         const description = lastUsed
-            ? ( localize(4356, "Last used this account {0}", fromNow(lastUsed, true)))
-            : ( localize(4357, "Has not used this account"));
+            ? ( localize(4373, "Last used this account {0}", fromNow(lastUsed, true)))
+            : ( localize(4374, "Has not used this account"));
         let tooltip;
         let disabled;
         if (extension.trusted) {
             tooltip = ( localize(
-                4358,
+                4375,
                 "This extension is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -134,7 +134,7 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
             tooltip,
             disabled,
             buttons: [{
-                    tooltip: ( localize(4359, "Manage account preferences for this extension")),
+                    tooltip: ( localize(4376, "Manage account preferences for this extension")),
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
                 }],
             picked: extension.allowed === undefined || extension.allowed
@@ -145,9 +145,9 @@ let ManageTrustedExtensionsForAccountActionImpl = class ManageTrustedExtensionsF
         const quickPick = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(4360, 'Cancel'));
-        quickPick.title = ( localize(4361, "Manage Trusted Extensions"));
-        quickPick.placeholder = ( localize(4362, "Choose which extensions can access this account"));
+        quickPick.customLabel = ( localize(4377, 'Cancel'));
+        quickPick.title = ( localize(4378, "Manage Trusted Extensions"));
+        quickPick.placeholder = ( localize(4379, "Choose which extensions can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             const updatedAllowedList = ( quickPick.items
                 .filter((item) => item.type !== 'separator')

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

@@ -18,8 +18,8 @@ class ManageTrustedMcpServersForAccountAction extends Action2 {
     constructor() {
         super({
             id: '_manageTrustedMCPServersForAccount',
-            title: ( localize2(4363, "Manage Trusted MCP Servers For Account")),
-            category: ( localize2(4364, "Accounts")),
+            title: ( localize2(4380, "Manage Trusted MCP Servers For Account")),
+            category: ( localize2(4381, "Accounts")),
             f1: true
         });
     }
@@ -57,7 +57,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         }
         const accounts = await this._getAllAvailableAccounts();
         const pick = await this._quickInputService.pick(accounts, {
-            placeHolder: ( localize(4365, "Pick an account to manage trusted MCP servers for")),
+            placeHolder: ( localize(4382, "Pick an account to manage trusted MCP servers for")),
             matchOnDescription: true,
         });
         return pick ? this._authenticationQueryService.provider(pick.providerId).account(pick.label) : undefined;
@@ -95,7 +95,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             };
         }));
         if (!filteredMcpServers.length) {
-            this._dialogService.info(( localize(4366, "This account has not been used by any MCP servers.")));
+            this._dialogService.info(( localize(4383, "This account has not been used by any MCP servers.")));
             return [];
         }
         const trustedServers = filteredMcpServers.filter(s => s.trusted);
@@ -103,20 +103,20 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         const sortByLastUsed = (a, b) => (b.lastUsed || 0) - (a.lastUsed || 0);
         return [
             ...( otherServers.sort(sortByLastUsed).map(this._toQuickPickItem)),
-            { type: 'separator', label: ( localize(4367, "Trusted by Microsoft")) },
+            { type: 'separator', label: ( localize(4384, "Trusted by Microsoft")) },
             ...( trustedServers.sort(sortByLastUsed).map(this._toQuickPickItem))
         ];
     }
     _toQuickPickItem(mcpServer) {
         const lastUsed = mcpServer.lastUsed;
         const description = lastUsed
-            ? ( localize(4368, "Last used this account {0}", fromNow(lastUsed, true)))
-            : ( localize(4369, "Has not used this account"));
+            ? ( localize(4385, "Last used this account {0}", fromNow(lastUsed, true)))
+            : ( localize(4386, "Has not used this account"));
         let tooltip;
         let disabled;
         if (mcpServer.trusted) {
             tooltip = ( localize(
-                4370,
+                4387,
                 "This MCP server is trusted by Microsoft and\nalways has access to this account"
             ));
             disabled = true;
@@ -128,7 +128,7 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
             tooltip,
             disabled,
             buttons: [{
-                    tooltip: ( localize(4371, "Manage account preferences for this MCP server")),
+                    tooltip: ( localize(4388, "Manage account preferences for this MCP server")),
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
                 }],
             picked: mcpServer.allowed === undefined || mcpServer.allowed
@@ -139,9 +139,9 @@ let ManageTrustedMcpServersForAccountActionImpl = class ManageTrustedMcpServersF
         const quickPick = disposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( localize(4372, 'Cancel'));
-        quickPick.title = ( localize(4373, "Manage Trusted MCP Servers"));
-        quickPick.placeholder = ( localize(4374, "Choose which MCP servers can access this account"));
+        quickPick.customLabel = ( localize(4389, 'Cancel'));
+        quickPick.title = ( localize(4390, "Manage Trusted MCP Servers"));
+        quickPick.placeholder = ( localize(4391, "Choose which MCP servers can access this account"));
         disposableStore.add(quickPick.onDidAccept(() => {
             quickPick.hide();
             const allServers = ( quickPick.items

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

@@ -11,7 +11,7 @@ class SignOutOfAccountAction extends Action2 {
     constructor() {
         super({
             id: '_signOutOfAccount',
-            title: ( localize(4375, "Sign out of account")),
+            title: ( localize(4392, "Sign out of account")),
             f1: false
         });
     }
@@ -32,13 +32,13 @@ class SignOutOfAccountAction extends Action2 {
             type: Severity.Info,
             message: accountUsages.length
                 ? ( localize(
-                4376,
+                4393,
                 "The account '{0}' has been used by: \n\n{1}\n\n Sign out from these extensions?",
                 accountLabel,
                 ( accountUsages.map(usage => usage.extensionName)).join('\n')
             ))
-                : ( localize(4377, "Sign out of '{0}'?", accountLabel)),
-            primaryButton: ( localize(4378, "&&Sign Out"))
+                : ( localize(4394, "Sign out of '{0}'?", accountLabel)),
+            primaryButton: ( localize(4395, "&&Sign Out"))
         });
         if (confirmed) {
             const removeSessionPromises = ( sessions.map(session => authenticationService.removeSession(providerId, session.id)));

package/vscode/src/vs/workbench/contrib/authentication/browser/authentication.contribution.js

@@ -41,9 +41,9 @@ class AuthenticationDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(4379, "Label")),
-            ( localize(4380, "ID")),
-            ( localize(4381, "MCP Authorization Servers"))
+            ( localize(4396, "Label")),
+            ( localize(4397, "ID")),
+            ( localize(4398, "MCP Authorization Servers"))
         ];
         const rows = ( authentication
             .sort((a, b) => a.label.localeCompare(b.label))
@@ -65,7 +65,7 @@ class AuthenticationDataRenderer extends Disposable {
 }
 const extensionFeature = ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'authentication',
-    label: ( localize(4382, "Authentication")),
+    label: ( localize(4399, "Authentication")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.d.ts

@@ -5,7 +5,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service";
 import { IAuthenticationAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service";
 import { IAuthenticationUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service";
-import { AuthenticationSession, AuthenticationSessionAccount } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
+import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationWWWAuthenticateRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
 import { IAuthenticationExtensionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
@@ -31,7 +31,7 @@ export declare class AuthenticationExtensionsService extends Disposable implemen
     private _inheritAuthAccountPreferenceChildToParent;
     constructor(activityService: IActivityService, storageService: IStorageService, dialogService: IDialogService, quickInputService: IQuickInputService, _productService: IProductService, _authenticationService: IAuthenticationService, _authenticationUsageService: IAuthenticationUsageService, _authenticationAccessService: IAuthenticationAccessService);
     private registerListeners;
-    private updateNewSessionRequests;
+    updateNewSessionRequests(providerId: string, addedSessions: readonly AuthenticationSession[]): void;
     private updateAccessRequests;
     private updateBadgeCount;
     private removeAccessRequest;
@@ -47,8 +47,8 @@ export declare class AuthenticationExtensionsService extends Disposable implemen
     /**
      * This function should be used only when there are sessions to disambiguate.
      */
-    selectSession(providerId: string, extensionId: string, extensionName: string, scopes: string[], availableSessions: AuthenticationSession[]): Promise<AuthenticationSession>;
+    selectSession(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWWWAuthenticateRequest, availableSessions: AuthenticationSession[]): Promise<AuthenticationSession>;
     private completeSessionAccessRequest;
-    requestSessionAccess(providerId: string, extensionId: string, extensionName: string, scopes: string[], possibleSessions: AuthenticationSession[]): void;
-    requestNewSession(providerId: string, scopes: string[], extensionId: string, extensionName: string): Promise<void>;
+    requestSessionAccess(providerId: string, extensionId: string, extensionName: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWWWAuthenticateRequest, possibleSessions: AuthenticationSession[]): void;
+    requestNewSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWWWAuthenticateRequest, extensionId: string, extensionName: string): Promise<void>;
 }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, MutableDisposable, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { scopesMatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
@@ -10,10 +11,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/noti
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { NumberBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
+import { isAuthenticationWWWAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
@@ -47,14 +49,13 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this._authenticationService.onDidChangeSessions(async (e) => {
+        this._register(this._authenticationService.onDidChangeSessions(e => {
             if (e.event.added?.length) {
-                await this.updateNewSessionRequests(e.providerId, e.event.added);
+                this.updateNewSessionRequests(e.providerId, e.event.added);
             }
             if (e.event.removed?.length) {
-                await this.updateAccessRequests(e.providerId, e.event.removed);
+                this.updateAccessRequests(e.providerId, e.event.removed);
             }
-            this.updateBadgeCount();
         }));
         this._register(this._authenticationService.onDidUnregisterAuthenticationProvider(e => {
             const accessRequests = this._sessionAccessRequestItems.get(e.id) || {};
@@ -63,15 +64,14 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             });
         }));
     }
-    async updateNewSessionRequests(providerId, addedSessions) {
+    updateNewSessionRequests(providerId, addedSessions) {
         const existingRequestsForProvider = this._signInRequestItems.get(providerId);
         if (!existingRequestsForProvider) {
             return;
         }
         ( Object.keys(existingRequestsForProvider)).forEach(requestedScopes => {
-            if (( addedSessions.some(
-                session => session.scopes.slice().join(SCOPESLIST_SEPARATOR) === requestedScopes
-            ))) {
+            const requestedScopesArray = requestedScopes.split(SCOPESLIST_SEPARATOR);
+            if (( addedSessions.some(session => scopesMatch(session.scopes, requestedScopesArray)))) {
                 const sessionRequest = existingRequestsForProvider[requestedScopes];
                 sessionRequest?.disposables.forEach(item => item.dispose());
                 delete existingRequestsForProvider[requestedScopes];
@@ -81,10 +81,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 else {
                     this._signInRequestItems.set(providerId, existingRequestsForProvider);
                 }
+                this.updateBadgeCount();
             }
         });
     }
-    async updateAccessRequests(providerId, removedSessions) {
+    updateAccessRequests(providerId, removedSessions) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId);
         if (providerRequests) {
             ( Object.keys(providerRequests)).forEach(extensionId => {
@@ -112,7 +113,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(12848, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(13046, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -179,7 +180,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                12849,
+                13047,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -187,11 +188,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localize(12850, "&&Allow")),
+                    label: ( localize(13048, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localize(12851, "&&Deny")),
+                    label: ( localize(13049, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -205,7 +206,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }
         return result === SessionPromptChoice.Allow;
     }
-    async selectSession(providerId, extensionId, extensionName, scopes, availableSessions) {
+    async selectSession(providerId, extensionId, extensionName, scopeListOrRequest, availableSessions) {
         const allAccounts = await this._authenticationService.getAccounts(providerId);
         if (!allAccounts.length) {
             throw ( new Error('No accounts available'));
@@ -227,16 +228,16 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 items.push({ label: account.label, account });
             }
         });
-        items.push({ label: ( localize(12852, "Sign in to another account")) });
+        items.push({ label: ( localize(13050, "Sign in to another account")) });
         quickPick.items = items;
         quickPick.title = ( localize(
-            12853,
+            13051,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            12854,
+            13052,
             "Select an account for '{0}' to use or Esc to cancel",
             extensionName
         ));
@@ -247,7 +248,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 if (!session) {
                     const account = quickPick.selectedItems[0].account;
                     try {
-                        session = await this._authenticationService.createSession(providerId, scopes, { account });
+                        session = await this._authenticationService.createSession(providerId, scopeListOrRequest, { account });
                     }
                     catch (e) {
                         reject(e);
@@ -269,7 +270,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             quickPick.show();
         }));
     }
-    async completeSessionAccessRequest(provider, extensionId, extensionName, scopes) {
+    async completeSessionAccessRequest(provider, extensionId, extensionName, scopeListOrRequest) {
         const providerRequests = this._sessionAccessRequestItems.get(provider.id) || {};
         const existingRequest = providerRequests[extensionId];
         if (!existingRequest) {
@@ -282,7 +283,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         let session;
         if (provider.supportsMultipleAccounts) {
             try {
-                session = await this.selectSession(provider.id, extensionId, extensionName, scopes, possibleSessions);
+                session = await this.selectSession(provider.id, extensionId, extensionName, scopeListOrRequest, possibleSessions);
             }
             catch (_) {
             }
@@ -297,7 +298,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             this._authenticationUsageService.addAccountUsage(provider.id, session.account.label, session.scopes, extensionId, extensionName);
         }
     }
-    requestSessionAccess(providerId, extensionId, extensionName, scopes, possibleSessions) {
+    requestSessionAccess(providerId, extensionId, extensionName, scopeListOrRequest, possibleSessions) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId) || {};
         const hasExistingRequest = providerRequests[extensionId];
         if (hasExistingRequest) {
@@ -308,20 +309,20 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(12855, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(13053, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
             id: `${providerId}${extensionId}Access`,
             handler: async (accessor) => {
-                this.completeSessionAccessRequest(provider, extensionId, extensionName, scopes);
+                this.completeSessionAccessRequest(provider, extensionId, extensionName, scopeListOrRequest);
             }
         });
         providerRequests[extensionId] = { possibleSessions, disposables: [menuItem, accessCommand] };
         this._sessionAccessRequestItems.set(providerId, providerRequests);
         this.updateBadgeCount();
     }
-    async requestNewSession(providerId, scopes, extensionId, extensionName) {
+    async requestNewSession(providerId, scopeListOrRequest, extensionId, extensionName) {
         if (!this._authenticationService.isAuthenticationProviderRegistered(providerId)) {
             await ( new Promise((resolve, _) => {
                 const dispose = this._authenticationService.onDidRegisterAuthenticationProvider(e => {
@@ -340,10 +341,12 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             return;
         }
         const providerRequests = this._signInRequestItems.get(providerId);
-        const scopesList = scopes.join(SCOPESLIST_SEPARATOR);
+        const signInRequestKey = isAuthenticationWWWAuthenticateRequest(scopeListOrRequest)
+            ? `${scopeListOrRequest.wwwAuthenticate}:${scopeListOrRequest.scopes?.join(SCOPESLIST_SEPARATOR) ?? ''}`
+            : `${scopeListOrRequest.join(SCOPESLIST_SEPARATOR)}`;
         const extensionHasExistingRequest = providerRequests
-            && providerRequests[scopesList]
-            && providerRequests[scopesList].requestingExtensionIds.includes(extensionId);
+            && providerRequests[signInRequestKey]
+            && providerRequests[signInRequestKey].requestingExtensionIds.includes(extensionId);
         if (extensionHasExistingRequest) {
             return;
         }
@@ -352,21 +355,21 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localize(12856, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(13054, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({
             id: commandId,
             handler: async (accessor) => {
                 const authenticationService = accessor.get(IAuthenticationService);
-                const session = await authenticationService.createSession(providerId, scopes);
+                const session = await authenticationService.createSession(providerId, scopeListOrRequest);
                 this._authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
                 this._updateAccountAndSessionPreferences(providerId, extensionId, session);
             }
         });
         if (providerRequests) {
-            const existingRequest = providerRequests[scopesList] || { disposables: [], requestingExtensionIds: [] };
-            providerRequests[scopesList] = {
+            const existingRequest = providerRequests[signInRequestKey] || { disposables: [], requestingExtensionIds: [] };
+            providerRequests[signInRequestKey] = {
                 disposables: [...existingRequest.disposables, menuItem, signInCommand],
                 requestingExtensionIds: [...existingRequest.requestingExtensionIds, extensionId]
             };
@@ -374,7 +377,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }
         else {
             this._signInRequestItems.set(providerId, {
-                [scopesList]: {
+                [signInRequestKey]: {
                     disposables: [menuItem, signInCommand],
                     requestingExtensionIds: [extensionId]
                 }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationUsageService.d.ts

@@ -23,6 +23,6 @@ export declare class AuthenticationUsageService extends Disposable implements IA
     extensionUsesAuth(extensionId: string): Promise<boolean>;
     readAccountUsages(providerId: string, accountName: string): IAccountUsage[];
     removeAccountUsage(providerId: string, accountName: string): void;
-    addAccountUsage(providerId: string, accountName: string, scopes: string[], extensionId: string, extensionName: string): void;
+    addAccountUsage(providerId: string, accountName: string, scopes: string[] | undefined, extensionId: string, extensionName: string): void;
     private _addExtensionsToCache;
 }