@codingame/monaco-vscode-authentication-service-override 25.1.2 → 26.0.0

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

@@ -6,7 +6,7 @@ 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';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { registerSingleton, InstantiationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 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';
@@ -16,15 +16,24 @@ import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 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 { IAuthenticationService, IAuthenticationExtensionsService } 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';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-const SCOPESLIST_SEPARATOR = ' ';
+const SCOPESLIST_SEPARATOR = " ";
 let AuthenticationExtensionsService = class AuthenticationExtensionsService extends Disposable {
-    constructor(activityService, storageService, dialogService, quickInputService, _productService, _authenticationService, _authenticationUsageService, _authenticationAccessService) {
+    constructor(
+        activityService,
+        storageService,
+        dialogService,
+        quickInputService,
+        _productService,
+        _authenticationService,
+        _authenticationUsageService,
+        _authenticationAccessService
+    ) {
         super();
         this.activityService = activityService;
         this.storageService = storageService;
@@ -41,7 +50,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.onDidChangeAccountPreference = this._onDidAccountPreferenceChange.event;
         this._inheritAuthAccountPreferenceParentToChildren = this._productService.inheritAuthAccountPreference || {};
         this._inheritAuthAccountPreferenceChildToParent = Object.entries(this._inheritAuthAccountPreferenceParentToChildren).reduce((acc, [parent, children]) => {
-            children.forEach((child) => {
+            children.forEach(child => {
                 acc[child] = parent;
             });
             return acc;
@@ -77,8 +86,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 delete existingRequestsForProvider[requestedScopes];
                 if (( Object.keys(existingRequestsForProvider)).length === 0) {
                     this._signInRequestItems.delete(providerId);
-                }
-                else {
+                } else {
                     this._signInRequestItems.set(providerId, existingRequestsForProvider);
                 }
                 this.updateBadgeCount();
@@ -113,8 +121,10 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(13716, "Sign in requested"))));
-            this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(14098, "Sign in requested"))));
+            this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({
+                badge
+            });
         }
     }
     removeAccessRequest(providerId, extensionId) {
@@ -133,16 +143,25 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.storageService.store(key, account.label, StorageScope.APPLICATION, StorageTarget.MACHINE);
         const childrenExtensions = this._inheritAuthAccountPreferenceParentToChildren[parentExtensionId];
         const extensionIds = childrenExtensions ? [parentExtensionId, ...childrenExtensions] : [parentExtensionId];
-        this._onDidAccountPreferenceChange.fire({ extensionIds, providerId });
+        this._onDidAccountPreferenceChange.fire({
+            extensionIds,
+            providerId
+        });
     }
     getAccountPreference(extensionId, providerId) {
         const realExtensionId = ExtensionIdentifier.toKey(extensionId);
-        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
+        const key = this._getKey(
+            this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId,
+            providerId
+        );
         return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
     }
     removeAccountPreference(extensionId, providerId) {
         const realExtensionId = ExtensionIdentifier.toKey(extensionId);
-        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
+        const key = this._getKey(
+            this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId,
+            providerId
+        );
         this.storageService.remove(key, StorageScope.WORKSPACE);
         this.storageService.remove(key, StorageScope.APPLICATION);
     }
@@ -172,52 +191,60 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
     }
     async showGetSessionPrompt(provider, accountName, extensionId, extensionName) {
         let SessionPromptChoice;
-        (function (SessionPromptChoice) {
+        (function(SessionPromptChoice) {
             SessionPromptChoice[SessionPromptChoice["Allow"] = 0] = "Allow";
             SessionPromptChoice[SessionPromptChoice["Deny"] = 1] = "Deny";
             SessionPromptChoice[SessionPromptChoice["Cancel"] = 2] = "Cancel";
         })(SessionPromptChoice || (SessionPromptChoice = {}));
-        const { result } = await this.dialogService.prompt({
+        const {
+            result
+        } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                13717,
+                14099,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
                 accountName
             )),
-            buttons: [
-                {
-                    label: ( localize(13718, "&&Allow")),
-                    run: () => SessionPromptChoice.Allow
-                },
-                {
-                    label: ( localize(13719, "&&Deny")),
-                    run: () => SessionPromptChoice.Deny
-                }
-            ],
+            buttons: [{
+                label: ( localize(14100, "&&Allow")),
+                run: () => SessionPromptChoice.Allow
+            }, {
+                label: ( localize(14101, "&&Deny")),
+                run: () => SessionPromptChoice.Deny
+            }],
             cancelButton: {
                 run: () => SessionPromptChoice.Cancel
             }
         });
         if (result !== SessionPromptChoice.Cancel) {
-            this._authenticationAccessService.updateAllowedExtensions(provider.id, accountName, [{ id: extensionId, name: extensionName, allowed: result === SessionPromptChoice.Allow }]);
+            this._authenticationAccessService.updateAllowedExtensions(provider.id, accountName, [{
+                id: extensionId,
+                name: extensionName,
+                allowed: result === SessionPromptChoice.Allow
+            }]);
             this.removeAccessRequest(provider.id, extensionId);
         }
         return result === SessionPromptChoice.Allow;
     }
-    async selectSession(providerId, extensionId, extensionName, scopeListOrRequest, availableSessions) {
+    async selectSession(
+        providerId,
+        extensionId,
+        extensionName,
+        scopeListOrRequest,
+        availableSessions
+    ) {
         const allAccounts = await this._authenticationService.getAccounts(providerId);
         if (!allAccounts.length) {
-            throw ( new Error('No accounts available'));
+            throw ( new Error("No accounts available"));
         }
         const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this.quickInputService.createQuickPick());
         quickPick.ignoreFocusOut = true;
         const accountsWithSessions = ( new Set());
-        const items = ( availableSessions
-            .filter(session => !( accountsWithSessions.has(session.account.label)) && accountsWithSessions.add(session.account.label))
-            .map(session => {
+        const items = (
+        availableSessions.filter(session => !( accountsWithSessions.has(session.account.label)) && accountsWithSessions.add(session.account.label)).map(session => {
             return {
                 label: session.account.label,
                 session: session
@@ -225,45 +252,55 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }));
         allAccounts.forEach(account => {
             if (!( accountsWithSessions.has(account.label))) {
-                items.push({ label: account.label, account });
+                items.push({
+                    label: account.label,
+                    account
+                });
             }
         });
-        items.push({ label: ( localize(13720, "Sign in to another account")) });
+        items.push({
+            label: ( localize(14102, "Sign in to another account"))
+        });
         quickPick.items = items;
         quickPick.title = ( localize(
-            13721,
+            14103,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            13722,
+            14104,
             "Select an account for '{0}' to use or Esc to cancel",
             extensionName
         ));
         return await ( new Promise((resolve, reject) => {
-            disposables.add(quickPick.onDidAccept(async (_) => {
+            disposables.add(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, scopeListOrRequest, { account });
-                    }
-                    catch (e) {
+                        session = await this._authenticationService.createSession(providerId, scopeListOrRequest, {
+                            account
+                        });
+                    } catch (e) {
                         reject(e);
                         return;
                     }
                 }
                 const accountName = session.account.label;
-                this._authenticationAccessService.updateAllowedExtensions(providerId, accountName, [{ id: extensionId, name: extensionName, allowed: true }]);
+                this._authenticationAccessService.updateAllowedExtensions(providerId, accountName, [{
+                    id: extensionId,
+                    name: extensionName,
+                    allowed: true
+                }]);
                 this._updateAccountAndSessionPreferences(providerId, extensionId, session);
                 this.removeAccessRequest(providerId, extensionId);
                 resolve(session);
             }));
             disposables.add(quickPick.onDidHide(_ => {
                 if (!quickPick.selectedItems[0]) {
-                    reject('User did not consent to account access');
+                    reject("User did not consent to account access");
                 }
                 disposables.dispose();
             }));
@@ -283,22 +320,37 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         let session;
         if (provider.supportsMultipleAccounts) {
             try {
-                session = await this.selectSession(provider.id, extensionId, extensionName, scopeListOrRequest, possibleSessions);
-            }
-            catch (_) {
-            }
-        }
-        else {
+                session = await this.selectSession(
+                    provider.id,
+                    extensionId,
+                    extensionName,
+                    scopeListOrRequest,
+                    possibleSessions
+                );
+            } catch (_) {}
+        } else {
             const approved = await this.showGetSessionPrompt(provider, possibleSessions[0].account.label, extensionId, extensionName);
             if (approved) {
                 session = possibleSessions[0];
             }
         }
         if (session) {
-            this._authenticationUsageService.addAccountUsage(provider.id, session.account.label, session.scopes, extensionId, extensionName);
+            this._authenticationUsageService.addAccountUsage(
+                provider.id,
+                session.account.label,
+                session.scopes,
+                extensionId,
+                extensionName
+            );
         }
     }
-    requestSessionAccess(providerId, extensionId, extensionName, scopeListOrRequest, possibleSessions) {
+    requestSessionAccess(
+        providerId,
+        extensionId,
+        extensionName,
+        scopeListOrRequest,
+        possibleSessions
+    ) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId) || {};
         const hasExistingRequest = providerRequests[extensionId];
         if (hasExistingRequest) {
@@ -306,19 +358,22 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }
         const provider = this._authenticationService.getProvider(providerId);
         const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
-            group: '3_accessRequests',
+            group: "3_accessRequests",
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(13723, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(14105, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
             id: `${providerId}${extensionId}Access`,
-            handler: async (accessor) => {
+            handler: async accessor => {
                 this.completeSessionAccessRequest(provider, extensionId, extensionName, scopeListOrRequest);
             }
         });
-        providerRequests[extensionId] = { possibleSessions, disposables: [menuItem, accessCommand] };
+        providerRequests[extensionId] = {
+            possibleSessions,
+            disposables: [menuItem, accessCommand]
+        };
         this._sessionAccessRequestItems.set(providerId, providerRequests);
         this.updateBadgeCount();
     }
@@ -336,46 +391,47 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         let provider;
         try {
             provider = this._authenticationService.getProvider(providerId);
-        }
-        catch (_e) {
+        } catch (_e) {
             return;
         }
         const providerRequests = this._signInRequestItems.get(providerId);
-        const signInRequestKey = isAuthenticationWwwAuthenticateRequest(scopeListOrRequest)
-            ? `${scopeListOrRequest.wwwAuthenticate}:${scopeListOrRequest.fallbackScopes?.join(SCOPESLIST_SEPARATOR) ?? ''}`
-            : `${scopeListOrRequest.join(SCOPESLIST_SEPARATOR)}`;
-        const extensionHasExistingRequest = providerRequests
-            && providerRequests[signInRequestKey]
-            && providerRequests[signInRequestKey].requestingExtensionIds.includes(extensionId);
+        const signInRequestKey = isAuthenticationWwwAuthenticateRequest(scopeListOrRequest) ? `${scopeListOrRequest.wwwAuthenticate}:${scopeListOrRequest.fallbackScopes?.join(SCOPESLIST_SEPARATOR) ?? ""}` : `${scopeListOrRequest.join(SCOPESLIST_SEPARATOR)}`;
+        const extensionHasExistingRequest = providerRequests && providerRequests[signInRequestKey] && providerRequests[signInRequestKey].requestingExtensionIds.includes(extensionId);
         if (extensionHasExistingRequest) {
             return;
         }
         const commandId = `${providerId}:${extensionId}:signIn${( Object.keys(providerRequests || [])).length}`;
         const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
-            group: '2_signInRequests',
+            group: "2_signInRequests",
             command: {
                 id: commandId,
-                title: ( localize(13724, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(14106, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({
             id: commandId,
-            handler: async (accessor) => {
+            handler: async accessor => {
                 const authenticationService = accessor.get(IAuthenticationService);
                 const session = await authenticationService.createSession(providerId, scopeListOrRequest);
-                this._authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
+                this._authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{
+                    id: extensionId,
+                    name: extensionName,
+                    allowed: true
+                }]);
                 this._updateAccountAndSessionPreferences(providerId, extensionId, session);
             }
         });
         if (providerRequests) {
-            const existingRequest = providerRequests[signInRequestKey] || { disposables: [], requestingExtensionIds: [] };
+            const existingRequest = providerRequests[signInRequestKey] || {
+                disposables: [],
+                requestingExtensionIds: []
+            };
             providerRequests[signInRequestKey] = {
                 disposables: [...existingRequest.disposables, menuItem, signInCommand],
                 requestingExtensionIds: [...existingRequest.requestingExtensionIds, extensionId]
             };
             this._signInRequestItems.set(providerId, providerRequests);
-        }
-        else {
+        } else {
             this._signInRequestItems.set(providerId, {
                 [signInRequestKey]: {
                     disposables: [menuItem, signInCommand],
@@ -386,15 +442,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.updateBadgeCount();
     }
 };
-AuthenticationExtensionsService = ( __decorate([
-    ( __param(0, IActivityService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IDialogService)),
-    ( __param(3, IQuickInputService)),
-    ( __param(4, IProductService)),
-    ( __param(5, IAuthenticationService)),
-    ( __param(6, IAuthenticationUsageService)),
-    ( __param(7, IAuthenticationAccessService))
-], AuthenticationExtensionsService));
+AuthenticationExtensionsService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IStorageService)), ( __param(2, IDialogService)), ( __param(3, IQuickInputService)), ( __param(4, IProductService)), ( __param(5, IAuthenticationService)), ( __param(6, IAuthenticationUsageService)), ( __param(7, IAuthenticationAccessService))], AuthenticationExtensionsService));
+( registerSingleton(
+    IAuthenticationExtensionsService,
+    AuthenticationExtensionsService,
+    InstantiationType.Delayed
+));
 
 export { AuthenticationExtensionsService };