maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

workbench api: additionalTrustedDomains

Browse source
This commit is contained in:
João Moreno 2021-07-23 09:45:54 +02:00
parent 0a1bc0b2e8
commit 51ca692319
No known key found for this signature in database
GPG key ID: 896B853774D1A575
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/url/browser/trustedDomains.ts
View file

@ -15,6 +15,7 @@ import { IAuthenticationService } from 'vs/workbench/services/authentication/bro
import { IFileService } from 'vs/platform/files/common/files';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
const TRUSTED_DOMAINS_URI = URI.parse('trustedDomains:/Trusted Domains');
@ -212,10 +213,12 @@ export async function readAuthenticationTrustedDomains(accessor: ServicesAccesso
export function readStaticTrustedDomains(accessor: ServicesAccessor): IStaticTrustedDomains {
const storageService = accessor.get(IStorageService);
const productService = accessor.get(IProductService);
const environmentService = accessor.get(IWorkbenchEnvironmentService);
const defaultTrustedDomains: string[] = productService.linkProtectionTrustedDomains
? [...productService.linkProtectionTrustedDomains]
: [];
const defaultTrustedDomains = [
...productService.linkProtectionTrustedDomains ?? [],
...environmentService.options?.additionalTrustedDomains ?? []
];
let trustedDomains: string[] = [];
try {

6
src/vs/workbench/workbench.web.api.ts
View file

@ -356,6 +356,12 @@ interface IWorkbenchConstructionOptions {
*/
readonly _enableBuiltinExtensions?: boolean;
/**
* Additional domains allowed to open from the workbench without the
* link protection popup.
*/
readonly additionalTrustedDomains?: string[];
/**
* Support for URL callbacks.
*/