@codingame/monaco-vscode-authentication-service-override 4.5.0 → 4.5.2

package/index.d.ts

@@ -1 +1 @@
-export { default } from './authentication.js';
+export { default } from 'vscode/service-override/authentication';

package/package.json

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

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

@@ -14,6 +14,7 @@ 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) {
@@ -25,9 +26,9 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this._authenticationService = _authenticationService;
         this._authenticationUsageService = _authenticationUsageService;
         this._authenticationAccessService = _authenticationAccessService;
-        this._signInRequestItems = ( new Map());
-        this._sessionAccessRequestItems = ( new Map());
-        this._accountBadgeDisposable = this._register(( new MutableDisposable()));
+        this._signInRequestItems = ( (new Map()));
+        this._sessionAccessRequestItems = ( (new Map()));
+        this._accountBadgeDisposable = this._register(( (new MutableDisposable())));
         this.registerListeners();
     }
     registerListeners() {
@@ -42,7 +43,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }));
         this._register(this._authenticationService.onDidUnregisterAuthenticationProvider(e => {
             const accessRequests = this._sessionAccessRequestItems.get(e.id) || {};
-            ( Object.keys(accessRequests)).forEach(extensionId => {
+            ( (Object.keys(accessRequests))).forEach(extensionId => {
                 this.removeAccessRequest(e.id, extensionId);
             });
         }));
@@ -52,14 +53,14 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         if (!existingRequestsForProvider) {
             return;
         }
-        ( Object.keys(existingRequestsForProvider)).forEach(requestedScopes => {
-            if (( addedSessions.some(
+        ( (Object.keys(existingRequestsForProvider))).forEach(requestedScopes => {
+            if (( (addedSessions.some(
                 session => session.scopes.slice().join(SCOPESLIST_SEPARATOR) === requestedScopes
-            ))) {
+            )))) {
                 const sessionRequest = existingRequestsForProvider[requestedScopes];
                 sessionRequest?.disposables.forEach(item => item.dispose());
                 delete existingRequestsForProvider[requestedScopes];
-                if (( Object.keys(existingRequestsForProvider)).length === 0) {
+                if (( (Object.keys(existingRequestsForProvider))).length === 0) {
                     this._signInRequestItems.delete(providerId);
                 }
                 else {
@@ -71,7 +72,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
     async updateAccessRequests(providerId, removedSessions) {
         const providerRequests = this._sessionAccessRequestItems.get(providerId);
         if (providerRequests) {
-            ( Object.keys(providerRequests)).forEach(extensionId => {
+            ( (Object.keys(providerRequests))).forEach(extensionId => {
                 removedSessions.forEach(removed => {
                     const indexOfSession = providerRequests[extensionId].possibleSessions.findIndex(session => session.id === removed.id);
                     if (indexOfSession) {
@@ -88,19 +89,15 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this._accountBadgeDisposable.clear();
         let numberOfRequests = 0;
         this._signInRequestItems.forEach(providerRequests => {
-            ( Object.keys(providerRequests)).forEach(request => {
+            ( (Object.keys(providerRequests))).forEach(request => {
                 numberOfRequests += providerRequests[request].requestingExtensionIds.length;
             });
         });
         this._sessionAccessRequestItems.forEach(accessRequest => {
-            numberOfRequests += ( Object.keys(accessRequest)).length;
+            numberOfRequests += ( (Object.keys(accessRequest))).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localizeWithPath(
-                'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                'sign in',
-                "Sign in requested"
-            ))));
+            const badge = ( (new NumberBadge(numberOfRequests, () => ( localizeWithPath(_moduleId, 0, "Sign in requested")))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -128,16 +125,16 @@ 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 = {})));
+        })(SessionPromptChoice || (SessionPromptChoice = {}))));
         const { result } = await this.dialogService.prompt({
             type: Severity$1.Info,
             message: ( localizeWithPath(
-                'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                'confirmAuthenticationAccess',
+                _moduleId,
+                1,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -145,19 +142,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localizeWithPath(
-                        'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                        { key: 'allow', comment: ['&& denotes a mnemonic'] },
-                        "&&Allow"
-                    )),
+                    label: ( localizeWithPath(_moduleId, 2, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localizeWithPath(
-                        'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                        { key: 'deny', comment: ['&& denotes a mnemonic'] },
-                        "&&Deny"
-                    )),
+                    label: ( localizeWithPath(_moduleId, 3, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -172,60 +161,55 @@ 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(
-                    'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                    'useOtherAccount',
-                    "Sign in to another account"
-                ))
-            });
-            quickPick.items = items;
-            quickPick.title = ( localizeWithPath(
-                'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                {
-                    key: 'selectAccount',
-                    comment: ['The placeholder {0} is the name of an extension. {1} is the name of the type of account, such as Microsoft or GitHub.']
-                },
-                "The extension '{0}' wants to access a {1} account",
-                extensionName,
-                this._authenticationService.getProvider(providerId).label
-            ));
-            quickPick.placeholder = ( localizeWithPath(
-                'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                'getSessionPlateholder',
-                "Select an account for '{0}' to use or Esc to cancel",
-                extensionName
-            ));
-            quickPick.onDidAccept(async (_) => {
-                const session = quickPick.selectedItems[0].session ?? (await this._authenticationService.createSession(providerId, scopes));
-                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);
-                quickPick.dispose();
-                resolve(session);
-            });
-            quickPick.onDidHide(_ => {
-                if (!quickPick.selectedItems[0]) {
-                    reject('User did not consent to account access');
+        return (
+             (new Promise((resolve, reject) => {
+                if (!availableSessions.length) {
+                    reject('No available sessions');
+                    return;
                 }
-                quickPick.dispose();
-            });
-            quickPick.show();
-        }));
+                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 (_) => {
+                    const session = quickPick.selectedItems[0].session ?? (await this._authenticationService.createSession(providerId, scopes));
+                    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);
+                    quickPick.dispose();
+                    resolve(session);
+                });
+                quickPick.onDidHide(_ => {
+                    if (!quickPick.selectedItems[0]) {
+                        reject('User did not consent to account access');
+                    }
+                    quickPick.dispose();
+                });
+                quickPick.show();
+            }))
+        );
     }
     async completeSessionAccessRequest(provider, extensionId, extensionName, scopes) {
         const providerRequests = this._sessionAccessRequestItems.get(provider.id) || {};
@@ -262,22 +246,19 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             return;
         }
         const provider = this._authenticationService.getProvider(providerId);
-        const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+        const menuItem = ( (MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
                 title: ( localizeWithPath(
-                    'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                    {
-                        key: 'accessRequest',
-                        comment: [`The placeholder {0} will be replaced with an authentication provider''s label. {1} will be replaced with an extension name. (1) is to indicate that this menu item contributes to a badge count`]
-                    },
+                    _moduleId,
+                    7,
                     "Grant access to {0} for {1}... (1)",
                     provider.label,
                     extensionName
                 ))
             }
-        }));
+        })));
         const accessCommand = CommandsRegistry.registerCommand({
             id: `${providerId}${extensionId}Access`,
             handler: async (accessor) => {
@@ -290,14 +271,14 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
     }
     async requestNewSession(providerId, scopes, extensionId, extensionName) {
         if (!this._authenticationService.isAuthenticationProviderRegistered(providerId)) {
-            await ( new Promise((resolve, _) => {
+            await ( (new Promise((resolve, _) => {
                 const dispose = this._authenticationService.onDidRegisterAuthenticationProvider(e => {
                     if (e.id === providerId) {
                         dispose.dispose();
                         resolve();
                     }
                 });
-            }));
+            })));
         }
         let provider;
         try {
@@ -314,23 +295,20 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         if (extensionHasExistingRequest) {
             return;
         }
-        const commandId = `${providerId}:${extensionId}:signIn${( Object.keys(providerRequests || [])).length}`;
-        const menuItem = ( MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+        const commandId = `${providerId}:${extensionId}:signIn${( (Object.keys(providerRequests || []))).length}`;
+        const menuItem = ( (MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
             group: '2_signInRequests',
             command: {
                 id: commandId,
                 title: ( localizeWithPath(
-                    'vs/workbench/services/authentication/browser/authenticationExtensionsService',
-                    {
-                        key: 'signInRequest',
-                        comment: [`The placeholder {0} will be replaced with an authentication provider's label. {1} will be replaced with an extension name. (1) is to indicate that this menu item contributes to a badge count.`]
-                    },
+                    _moduleId,
+                    8,
                     "Sign in with {0} to use {1} (1)",
                     provider.label,
                     extensionName
                 ))
             }
-        }));
+        })));
         const signInCommand = CommandsRegistry.registerCommand({
             id: commandId,
             handler: async (accessor) => {
@@ -359,14 +337,14 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this.updateBadgeCount();
     }
 };
-AuthenticationExtensionsService = ( __decorate([
-    ( __param(0, IActivityService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IDialogService)),
-    ( __param(3, IQuickInputService)),
-    ( __param(4, IAuthenticationService)),
-    ( __param(5, IAuthenticationUsageService)),
-    ( __param(6, IAuthenticationAccessService))
-], AuthenticationExtensionsService));
+AuthenticationExtensionsService = ( (__decorate([
+    ( (__param(0, IActivityService))),
+    ( (__param(1, IStorageService))),
+    ( (__param(2, IDialogService))),
+    ( (__param(3, IQuickInputService))),
+    ( (__param(4, IAuthenticationService))),
+    ( (__param(5, IAuthenticationUsageService))),
+    ( (__param(6, IAuthenticationAccessService)))
+], AuthenticationExtensionsService)));
 
 export { AuthenticationExtensionsService };

package/authentication.d.ts

@@ -1,5 +0,0 @@
-import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-
-declare function getServiceOverride(): IEditorOverrideServices;
-
-export { getServiceOverride as default };