mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-24 10:38:59 +01:00
305134296c
This adopts the `NativeBrokerPlugin` provided by `@azure/msal-node-extensions` to provide the ability to use auth state from the OS, and show native auth dialogs instead of going to the browser.
This has several pieces:
* The adoption of the broker in the microsoft-authentication extension:
* Adding `NativeBrokerPlugin` to our PCAs
* Using the proposed handle API to pass the native window handle down to MSAL calls (btw, this API will change in a follow up PR)
* Adopting an AccountAccess layer to handle:
* giving the user control of which accounts VS Code uses
* an eventing layer so that auth state can be updated across multiple windows
* Getting the extension to build properly and only build what it really needs. This required several package.json/webpack hacks:
* Use a fake keytar since we don't use the feature in `@azure/msal-node-extensions` that uses keytar
* Use a fake dpapi layer since we don't use the feature in `@azure/msal-node-extensions` that uses it
* Ensure the msal runtime `.node` and `.dll` files are included in the bundle
* Get the VS Code build to allow a native node module in an extension: by having a list of native extensions that will be built in the "ci" part of the build - in other words when VS Code is building on the target platform
There are a couple of followups:
* Refactor the `handle` API to handle (heh) Auxiliary Windows https://github.com/microsoft/vscode/issues/233106
* Separate the call to `acquireTokenSilent` and `acquireTokenInteractive` and all the usage of this native node module into a separate process or maybe in Core... we'll see. Something to experiment with after we have something working. NEEDS FOLLOW UP ISSUE
Fixes https://github.com/microsoft/vscode/issues/229431
66 lines
2.1 KiB
TypeScript
66 lines
2.1 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import * as path from 'path';
|
|
import * as fs from 'fs';
|
|
import * as minimatch from 'minimatch';
|
|
import { makeUniversalApp } from 'vscode-universal-bundler';
|
|
|
|
const root = path.dirname(path.dirname(__dirname));
|
|
|
|
async function main(buildDir?: string) {
|
|
const arch = process.env['VSCODE_ARCH'];
|
|
|
|
if (!buildDir) {
|
|
throw new Error('Build dir not provided');
|
|
}
|
|
|
|
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
|
|
const appName = product.nameLong + '.app';
|
|
const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
|
|
const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
|
|
const asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
|
|
const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
|
|
const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
|
|
|
|
const filesToSkip = [
|
|
'**/CodeResources',
|
|
'**/Credits.rtf',
|
|
// TODO: Should we consider expanding this to other files in this area?
|
|
'**/node_modules/@parcel/node-addon-api/nothing.target.mk'
|
|
];
|
|
|
|
await makeUniversalApp({
|
|
x64AppPath,
|
|
arm64AppPath,
|
|
asarPath: asarRelativePath,
|
|
outAppPath,
|
|
force: true,
|
|
mergeASARs: true,
|
|
x64ArchFiles: '*/kerberos.node',
|
|
filesToSkipComparison: (file: string) => {
|
|
for (const expected of filesToSkip) {
|
|
if (minimatch(file, expected)) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
});
|
|
|
|
const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
|
|
Object.assign(productJson, {
|
|
darwinUniversalAssetId: 'darwin-universal'
|
|
});
|
|
fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
|
|
}
|
|
|
|
if (require.main === module) {
|
|
main(process.argv[2]).catch(err => {
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|
|
}
|