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

package/authentication.js

@@ -1,9 +1,11 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
+import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { AuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
-import { IAuthenticationAccessService, AuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService, AuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService';
+import { AuthenticationAccessService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationAccessService.js';
+import { AuthenticationUsageService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationUsageService.js';
 import { AuthenticationExtensionsService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js';
+import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
+import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
 
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,7 +17,15 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0"
   }
 }

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

@@ -0,0 +1,70 @@
+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 { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+let AuthenticationAccessService = class AuthenticationAccessService extends Disposable {
+    constructor(_storageService, _productService) {
+        super();
+        this._storageService = _storageService;
+        this._productService = _productService;
+        this._onDidChangeExtensionSessionAccess = this._register(( new Emitter()));
+        this.onDidChangeExtensionSessionAccess = this._onDidChangeExtensionSessionAccess.event;
+    }
+    isAccessAllowed(providerId, accountName, extensionId) {
+        const trustedExtensionAuthAccess = this._productService.trustedExtensionAuthAccess;
+        if (Array.isArray(trustedExtensionAuthAccess)) {
+            if (trustedExtensionAuthAccess.includes(extensionId)) {
+                return true;
+            }
+        }
+        else if (trustedExtensionAuthAccess?.[providerId]?.includes(extensionId)) {
+            return true;
+        }
+        const allowList = this.readAllowedExtensions(providerId, accountName);
+        const extensionData = allowList.find(extension => extension.id === extensionId);
+        if (!extensionData) {
+            return undefined;
+        }
+        return extensionData.allowed !== undefined
+            ? extensionData.allowed
+            : true;
+    }
+    readAllowedExtensions(providerId, accountName) {
+        let trustedExtensions = [];
+        try {
+            const trustedExtensionSrc = this._storageService.get(`${providerId}-${accountName}`, -1 );
+            if (trustedExtensionSrc) {
+                trustedExtensions = JSON.parse(trustedExtensionSrc);
+            }
+        }
+        catch (err) { }
+        return trustedExtensions;
+    }
+    updateAllowedExtensions(providerId, accountName, extensions) {
+        const allowList = this.readAllowedExtensions(providerId, accountName);
+        for (const extension of extensions) {
+            const index = allowList.findIndex(e => e.id === extension.id);
+            if (index === -1) {
+                allowList.push(extension);
+            }
+            else {
+                allowList[index].allowed = extension.allowed;
+            }
+        }
+        this._storageService.store(`${providerId}-${accountName}`, JSON.stringify(allowList), -1 , 0 );
+        this._onDidChangeExtensionSessionAccess.fire({ providerId, accountName });
+    }
+    removeAllowedExtensions(providerId, accountName) {
+        this._storageService.remove(`${providerId}-${accountName}`, -1 );
+        this._onDidChangeExtensionSessionAccess.fire({ providerId, accountName });
+    }
+};
+AuthenticationAccessService = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, IProductService))
+], AuthenticationAccessService));
+
+export { AuthenticationAccessService };

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

@@ -3,15 +3,16 @@ import { Disposable, MutableDisposable, dispose } from 'vscode/vscode/vs/base/co
 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 '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IActivityService, NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService';
-import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+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';
+import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
+import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
+import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const SCOPESLIST_SEPARATOR = ' ';
 let AuthenticationExtensionsService = class AuthenticationExtensionsService extends Disposable {
@@ -133,7 +134,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             SessionPromptChoice[SessionPromptChoice["Cancel"] = 2] = "Cancel";
         })(SessionPromptChoice || (SessionPromptChoice = {})));
         const { result } = await this.dialogService.prompt({
-            type: Severity.Info,
+            type: Severity$1.Info,
             message: ( localizeWithPath(
                 'vs/workbench/services/authentication/browser/authenticationExtensionsService',
                 'confirmAuthenticationAccess',

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

@@ -0,0 +1,51 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+let AuthenticationUsageService = class AuthenticationUsageService {
+    constructor(_storageService) {
+        this._storageService = _storageService;
+    }
+    readAccountUsages(providerId, accountName) {
+        const accountKey = `${providerId}-${accountName}-usages`;
+        const storedUsages = this._storageService.get(accountKey, -1 );
+        let usages = [];
+        if (storedUsages) {
+            try {
+                usages = JSON.parse(storedUsages);
+            }
+            catch (e) {
+            }
+        }
+        return usages;
+    }
+    removeAccountUsage(providerId, accountName) {
+        const accountKey = `${providerId}-${accountName}-usages`;
+        this._storageService.remove(accountKey, -1 );
+    }
+    addAccountUsage(providerId, accountName, extensionId, extensionName) {
+        const accountKey = `${providerId}-${accountName}-usages`;
+        const usages = this.readAccountUsages(providerId, accountName);
+        const existingUsageIndex = usages.findIndex(usage => usage.extensionId === extensionId);
+        if (existingUsageIndex > -1) {
+            usages.splice(existingUsageIndex, 1, {
+                extensionId,
+                extensionName,
+                lastUsed: Date.now()
+            });
+        }
+        else {
+            usages.push({
+                extensionId,
+                extensionName,
+                lastUsed: Date.now()
+            });
+        }
+        this._storageService.store(accountKey, JSON.stringify(usages), -1 , 1 );
+    }
+};
+AuthenticationUsageService = ( __decorate([
+    ( __param(0, IStorageService))
+], AuthenticationUsageService));
+
+export { AuthenticationUsageService };

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,10 +0,0 @@
-export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
-
-var ConfirmResult;
-( (function(ConfirmResult) {
-    ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
-    ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
-    ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
-})(ConfirmResult || (ConfirmResult = {})));
-
-export { ConfirmResult };