@codingame/monaco-vscode-authentication-service-override 8.0.4 → 9.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "8.0.4",
+  "version": "9.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@8.0.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
   }
 }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Disposable, MutableDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
@@ -98,7 +98,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( (Object.keys(accessRequest))).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( (new NumberBadge(numberOfRequests, () => ( localize(2141, "Sign in requested")))));
+            const badge = ( (new NumberBadge(numberOfRequests, () => ( localize(2247, "Sign in requested")))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -111,16 +111,16 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }
     }
     updateSessionPreference(providerId, extensionId, session) {
-        const key = `${extensionId}-${providerId}-${session.scopes.join(' ')}`;
+        const key = `${extensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
         this.storageService.store(key, session.id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this.storageService.store(key, session.id, StorageScope.APPLICATION, StorageTarget.MACHINE);
     }
     getSessionPreference(providerId, extensionId, scopes) {
-        const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+        const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
         return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
     }
     removeSessionPreference(providerId, extensionId, scopes) {
-        const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+        const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
         this.storageService.remove(key, StorageScope.WORKSPACE);
         this.storageService.remove(key, StorageScope.APPLICATION);
     }
@@ -134,7 +134,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         const { result } = await this.dialogService.prompt({
             type: Severity$1.Info,
             message: ( localize(
-                2142,
+                2248,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -142,11 +142,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localize(2143, "&&Allow")),
+                    label: ( localize(2249, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localize(2144, "&&Deny")),
+                    label: ( localize(2250, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -165,7 +165,8 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         if (!allAccounts.length) {
             throw ( (new Error('No accounts available')));
         }
-        const quickPick = this.quickInputService.createQuickPick();
+        const disposables = ( (new DisposableStore()));
+        const quickPick = disposables.add(this.quickInputService.createQuickPick());
         quickPick.ignoreFocusOut = true;
         const items = ( (availableSessions.map(session => {
             return {
@@ -179,17 +180,17 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 items.push({ label: account.label, account });
             }
         });
-        items.push({ label: ( localize(2145, "Sign in to another account")) });
+        items.push({ label: ( localize(2251, "Sign in to another account")) });
         quickPick.items = items;
         quickPick.title = ( localize(
-            2146,
+            2252,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
-        quickPick.placeholder = ( localize(2147, "Select an account for '{0}' to use or Esc to cancel", extensionName));
+        quickPick.placeholder = ( localize(2253, "Select an account for '{0}' to use or Esc to cancel", extensionName));
         return await ( (new Promise((resolve, reject) => {
-            quickPick.onDidAccept(async (_) => {
+            disposables.add(quickPick.onDidAccept(async (_) => {
                 quickPick.dispose();
                 let session = quickPick.selectedItems[0].session;
                 if (!session) {
@@ -207,13 +208,13 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 this.updateSessionPreference(providerId, extensionId, session);
                 this.removeAccessRequest(providerId, extensionId);
                 resolve(session);
-            });
-            quickPick.onDidHide(_ => {
-                quickPick.dispose();
+            }));
+            disposables.add(quickPick.onDidHide(_ => {
                 if (!quickPick.selectedItems[0]) {
                     reject('User did not consent to account access');
                 }
-            });
+                disposables.dispose();
+            }));
             quickPick.show();
         })));
     }
@@ -256,7 +257,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(2148, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(2254, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         })));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -300,7 +301,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localize(2149, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(2255, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         })));
         const signInCommand = CommandsRegistry.registerCommand({