@codingame/monaco-vscode-authentication-service-override 5.2.0 → 6.0.0

package/package.json

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

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

@@ -1,7 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
@@ -35,7 +37,7 @@ let AuthenticationAccessService = class AuthenticationAccessService extends Disp
     readAllowedExtensions(providerId, accountName) {
         let trustedExtensions = [];
         try {
-            const trustedExtensionSrc = this._storageService.get(`${providerId}-${accountName}`, -1 );
+            const trustedExtensionSrc = this._storageService.get(`${providerId}-${accountName}`, StorageScope.APPLICATION);
             if (trustedExtensionSrc) {
                 trustedExtensions = JSON.parse(trustedExtensionSrc);
             }
@@ -54,11 +56,11 @@ let AuthenticationAccessService = class AuthenticationAccessService extends Disp
                 allowList[index].allowed = extension.allowed;
             }
         }
-        this._storageService.store(`${providerId}-${accountName}`, JSON.stringify(allowList), -1 , 0 );
+        this._storageService.store(`${providerId}-${accountName}`, JSON.stringify(allowList), StorageScope.APPLICATION, StorageTarget.USER);
         this._onDidChangeExtensionSessionAccess.fire({ providerId, accountName });
     }
     removeAllowedExtensions(providerId, accountName) {
-        this._storageService.remove(`${providerId}-${accountName}`, -1 );
+        this._storageService.remove(`${providerId}-${accountName}`, StorageScope.APPLICATION);
         this._onDidChangeExtensionSessionAccess.fire({ providerId, accountName });
     }
 };

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

@@ -4,8 +4,10 @@ import { localizeWithPath } 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';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
@@ -111,17 +113,17 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
     }
     updateSessionPreference(providerId, extensionId, session) {
         const key = `${extensionId}-${providerId}-${session.scopes.join(' ')}`;
-        this.storageService.store(key, session.id, 1 , 1 );
-        this.storageService.store(key, session.id, -1 , 1 );
+        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(' ')}`;
-        return this.storageService.get(key, 1 ) ?? this.storageService.get(key, -1 );
+        return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
     }
     removeSessionPreference(providerId, extensionId, scopes) {
         const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
-        this.storageService.remove(key, 1 );
-        this.storageService.remove(key, -1 );
+        this.storageService.remove(key, StorageScope.WORKSPACE);
+        this.storageService.remove(key, StorageScope.APPLICATION);
     }
     async showGetSessionPrompt(provider, accountName, extensionId, extensionName) {
         let SessionPromptChoice;
@@ -193,19 +195,28 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                     extensionName
                 ));
                 quickPick.onDidAccept(async (_) => {
-                    const session = quickPick.selectedItems[0].session ?? (await this._authenticationService.createSession(providerId, scopes));
+                    quickPick.dispose();
+                    let session = quickPick.selectedItems[0].session;
+                    if (!session) {
+                        try {
+                            session = await this._authenticationService.createSession(providerId, scopes);
+                        }
+                        catch (e) {
+                            reject(e);
+                            return;
+                        }
+                    }
                     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(_ => {
+                    quickPick.dispose();
                     if (!quickPick.selectedItems[0]) {
                         reject('User did not consent to account access');
                     }
-                    quickPick.dispose();
                 });
                 quickPick.show();
             }))

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

@@ -1,4 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
@@ -8,7 +10,7 @@ let AuthenticationUsageService = class AuthenticationUsageService {
     }
     readAccountUsages(providerId, accountName) {
         const accountKey = `${providerId}-${accountName}-usages`;
-        const storedUsages = this._storageService.get(accountKey, -1 );
+        const storedUsages = this._storageService.get(accountKey, StorageScope.APPLICATION);
         let usages = [];
         if (storedUsages) {
             try {
@@ -21,7 +23,7 @@ let AuthenticationUsageService = class AuthenticationUsageService {
     }
     removeAccountUsage(providerId, accountName) {
         const accountKey = `${providerId}-${accountName}-usages`;
-        this._storageService.remove(accountKey, -1 );
+        this._storageService.remove(accountKey, StorageScope.APPLICATION);
     }
     addAccountUsage(providerId, accountName, extensionId, extensionName) {
         const accountKey = `${providerId}-${accountName}-usages`;
@@ -41,7 +43,7 @@ let AuthenticationUsageService = class AuthenticationUsageService {
                 lastUsed: Date.now()
             });
         }
-        this._storageService.store(accountKey, JSON.stringify(usages), -1 , 1 );
+        this._storageService.store(accountKey, JSON.stringify(usages), StorageScope.APPLICATION, StorageTarget.MACHINE);
     }
 };
 AuthenticationUsageService = ( __decorate([