@codingame/monaco-vscode-authentication-service-override 7.1.0 → 8.0.0

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, MutableDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -16,7 +16,6 @@ import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/services/authentication/browser/authenticationExtensionsService";
 const SCOPESLIST_SEPARATOR = ' ';
 let AuthenticationExtensionsService = class AuthenticationExtensionsService extends Disposable {
     constructor(activityService, storageService, dialogService, quickInputService, _authenticationService, _authenticationUsageService, _authenticationAccessService) {
@@ -99,7 +98,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( (Object.keys(accessRequest))).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( (new NumberBadge(numberOfRequests, () => ( localizeWithPath(_moduleId, 0, "Sign in requested")))));
+            const badge = ( (new NumberBadge(numberOfRequests, () => ( localize(1663, "Sign in requested")))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -134,9 +133,8 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         })(SessionPromptChoice || (SessionPromptChoice = {}))));
         const { result } = await this.dialogService.prompt({
             type: Severity$1.Info,
-            message: ( localizeWithPath(
-                _moduleId,
-                1,
+            message: ( localize(
+                1664,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -144,11 +142,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localizeWithPath(_moduleId, 2, "&&Allow")),
+                    label: ( localize(1665, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localizeWithPath(_moduleId, 3, "&&Deny")),
+                    label: ( localize(1666, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -163,64 +161,61 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         return result === SessionPromptChoice.Allow;
     }
     async selectSession(providerId, extensionId, extensionName, scopes, availableSessions) {
-        return (
-             (new Promise((resolve, reject) => {
-                if (!availableSessions.length) {
-                    reject('No available sessions');
-                    return;
-                }
-                const quickPick = this.quickInputService.createQuickPick();
-                quickPick.ignoreFocusOut = true;
-                const items = ( (availableSessions.map(session => {
-                    return {
-                        label: session.account.label,
-                        session: session
-                    };
-                })));
-                items.push({
-                    label: ( localizeWithPath(_moduleId, 4, "Sign in to another account"))
-                });
-                quickPick.items = items;
-                quickPick.title = ( localizeWithPath(
-                    _moduleId,
-                    5,
-                    "The extension '{0}' wants to access a {1} account",
-                    extensionName,
-                    this._authenticationService.getProvider(providerId).label
-                ));
-                quickPick.placeholder = ( localizeWithPath(
-                    _moduleId,
-                    6,
-                    "Select an account for '{0}' to use or Esc to cancel",
-                    extensionName
-                ));
-                quickPick.onDidAccept(async (_) => {
-                    quickPick.dispose();
-                    let session = quickPick.selectedItems[0].session;
-                    if (!session) {
-                        try {
-                            session = await this._authenticationService.createSession(providerId, scopes);
-                        }
-                        catch (e) {
-                            reject(e);
-                            return;
-                        }
+        const allAccounts = await this._authenticationService.getAccounts(providerId);
+        if (!allAccounts.length) {
+            throw ( (new Error('No accounts available')));
+        }
+        const quickPick = this.quickInputService.createQuickPick();
+        quickPick.ignoreFocusOut = true;
+        const items = ( (availableSessions.map(session => {
+            return {
+                label: session.account.label,
+                session: session
+            };
+        })));
+        const accountsWithSessions = ( (new Set( (availableSessions.map(session => session.account.label)))));
+        allAccounts.forEach(account => {
+            if (!( (accountsWithSessions.has(account.label)))) {
+                items.push({ label: account.label, account });
+            }
+        });
+        items.push({ label: ( localize(1667, "Sign in to another account")) });
+        quickPick.items = items;
+        quickPick.title = ( localize(
+            1668,
+            "The extension '{0}' wants to access a {1} account",
+            extensionName,
+            this._authenticationService.getProvider(providerId).label
+        ));
+        quickPick.placeholder = ( localize(1669, "Select an account for '{0}' to use or Esc to cancel", extensionName));
+        return await ( (new Promise((resolve, reject) => {
+            quickPick.onDidAccept(async (_) => {
+                quickPick.dispose();
+                let session = quickPick.selectedItems[0].session;
+                if (!session) {
+                    const account = quickPick.selectedItems[0].account;
+                    try {
+                        session = await this._authenticationService.createSession(providerId, scopes, { account });
                     }
-                    const accountName = session.account.label;
-                    this._authenticationAccessService.updateAllowedExtensions(providerId, accountName, [{ id: extensionId, name: extensionName, allowed: true }]);
-                    this.updateSessionPreference(providerId, extensionId, session);
-                    this.removeAccessRequest(providerId, extensionId);
-                    resolve(session);
-                });
-                quickPick.onDidHide(_ => {
-                    quickPick.dispose();
-                    if (!quickPick.selectedItems[0]) {
-                        reject('User did not consent to account access');
+                    catch (e) {
+                        reject(e);
+                        return;
                     }
-                });
-                quickPick.show();
-            }))
-        );
+                }
+                const accountName = session.account.label;
+                this._authenticationAccessService.updateAllowedExtensions(providerId, accountName, [{ id: extensionId, name: extensionName, allowed: true }]);
+                this.updateSessionPreference(providerId, extensionId, session);
+                this.removeAccessRequest(providerId, extensionId);
+                resolve(session);
+            });
+            quickPick.onDidHide(_ => {
+                quickPick.dispose();
+                if (!quickPick.selectedItems[0]) {
+                    reject('User did not consent to account access');
+                }
+            });
+            quickPick.show();
+        })));
     }
     async completeSessionAccessRequest(provider, extensionId, extensionName, scopes) {
         const providerRequests = this._sessionAccessRequestItems.get(provider.id) || {};
@@ -261,13 +256,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localizeWithPath(
-                    _moduleId,
-                    7,
-                    "Grant access to {0} for {1}... (1)",
-                    provider.label,
-                    extensionName
-                ))
+                title: ( localize(1670, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         })));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -311,13 +300,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localizeWithPath(
-                    _moduleId,
-                    8,
-                    "Sign in with {0} to use {1} (1)",
-                    provider.label,
-                    extensionName
-                ))
+                title: ( localize(1671, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         })));
         const signInCommand = CommandsRegistry.registerCommand({