@codingame/monaco-vscode-authentication-service-override 10.1.4 → 11.0.1

package/package.json

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

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 { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const SCOPESLIST_SEPARATOR = ' ';
@@ -108,7 +109,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( (Object.keys(accessRequest))).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( (new NumberBadge(numberOfRequests, () => ( localize(2253, "Sign in requested")))));
+            const badge = ( (new NumberBadge(numberOfRequests, () => ( localize(2157, "Sign in requested")))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -121,7 +122,8 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         }
     }
     updateAccountPreference(extensionId, providerId, account) {
-        const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId;
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId;
         const key = this._getKey(parentExtensionId, providerId);
         this.storageService.store(key, account.label, 1 , 1 );
         this.storageService.store(key, account.label, -1 , 1 );
@@ -130,11 +132,13 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         this._onDidAccountPreferenceChange.fire({ extensionIds, providerId });
     }
     getAccountPreference(extensionId, providerId) {
-        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
         return this.storageService.get(key, 1 ) ?? this.storageService.get(key, -1 );
     }
     removeAccountPreference(extensionId, providerId) {
-        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
         this.storageService.remove(key, 1 );
         this.storageService.remove(key, -1 );
     }
@@ -142,16 +146,19 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         return `${extensionId}-${providerId}`;
     }
     updateSessionPreference(providerId, extensionId, session) {
-        const key = `${extensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const key = `${realExtensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
         this.storageService.store(key, session.id, 1 , 1 );
         this.storageService.store(key, session.id, -1 , 1 );
     }
     getSessionPreference(providerId, extensionId, scopes) {
-        const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const key = `${realExtensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
         return this.storageService.get(key, 1 ) ?? this.storageService.get(key, -1 );
     }
     removeSessionPreference(providerId, extensionId, scopes) {
-        const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
+        const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+        const key = `${realExtensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
         this.storageService.remove(key, 1 );
         this.storageService.remove(key, -1 );
     }
@@ -169,7 +176,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         const { result } = await this.dialogService.prompt({
             type: Severity$1.Info,
             message: ( localize(
-                2254,
+                2158,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -177,11 +184,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localize(2255, "&&Allow")),
+                    label: ( localize(2159, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localize(2256, "&&Deny")),
+                    label: ( localize(2160, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -217,15 +224,15 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 items.push({ label: account.label, account });
             }
         });
-        items.push({ label: ( localize(2257, "Sign in to another account")) });
+        items.push({ label: ( localize(2161, "Sign in to another account")) });
         quickPick.items = items;
         quickPick.title = ( localize(
-            2258,
+            2162,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
-        quickPick.placeholder = ( localize(2259, "Select an account for '{0}' to use or Esc to cancel", extensionName));
+        quickPick.placeholder = ( localize(2163, "Select an account for '{0}' to use or Esc to cancel", extensionName));
         return await ( (new Promise((resolve, reject) => {
             disposables.add(quickPick.onDidAccept(async (_) => {
                 quickPick.dispose();
@@ -280,7 +287,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             }
         }
         if (session) {
-            this._authenticationUsageService.addAccountUsage(provider.id, session.account.label, extensionId, extensionName);
+            this._authenticationUsageService.addAccountUsage(provider.id, session.account.label, session.scopes, extensionId, extensionName);
         }
     }
     requestSessionAccess(providerId, extensionId, extensionName, scopes, possibleSessions) {
@@ -294,7 +301,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(2260, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(2164, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         })));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -338,7 +345,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localize(2261, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(2165, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         })));
         const signInCommand = CommandsRegistry.registerCommand({

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

@@ -54,7 +54,7 @@ let AuthenticationUsageService = class AuthenticationUsageService extends Dispos
         const accountKey = `${providerId}-${accountName}-usages`;
         this._storageService.remove(accountKey, -1 );
     }
-    addAccountUsage(providerId, accountName, extensionId, extensionName) {
+    addAccountUsage(providerId, accountName, scopes, extensionId, extensionName) {
         const accountKey = `${providerId}-${accountName}-usages`;
         const usages = this.readAccountUsages(providerId, accountName);
         const existingUsageIndex = usages.findIndex(usage => usage.extensionId === extensionId);
@@ -62,6 +62,7 @@ let AuthenticationUsageService = class AuthenticationUsageService extends Dispos
             usages.splice(existingUsageIndex, 1, {
                 extensionId,
                 extensionName,
+                scopes,
                 lastUsed: Date.now()
             });
         }
@@ -69,6 +70,7 @@ let AuthenticationUsageService = class AuthenticationUsageService extends Dispos
             usages.push({
                 extensionId,
                 extensionName,
+                scopes,
                 lastUsed: Date.now()
             });
         }