Remove CredentialsService & keytar

.github/workflows/ci.yml

@@ -221,8 +221,7 @@ jobs:
       - name: Compile Integration Tests
         run: yarn --cwd test/integration/browser compile
 
-      # This is required for keytar unittests, otherwise we hit
-      # https://github.com/atom/node-keytar/issues/76
+      # This is required for SecretStorage unittests
       - name: Create temporary keychain
         run: |
           security create-keychain -p pwd $RUNNER_TEMP/buildagent.keychain

build/.moduleignore

@@ -79,13 +79,6 @@ kerberos/src/**
 kerberos/node_modules/**
 !kerberos/**/*.node
 
-keytar/binding.gyp
-keytar/build/**
-keytar/src/**
-keytar/script/**
-keytar/node_modules/**
-!keytar/**/*.node
-
 node-pty/binding.gyp
 node-pty/build/**
 node-pty/src/**

build/darwin/create-universal-app.ts

@@ -51,7 +51,7 @@ async function main(buildDir?: string) {
 	fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
 
 	// Verify if native module architecture is correct
-	const findOutput = await spawn('find', [outAppPath, '-name', 'keytar.node']);
+	const findOutput = await spawn('find', [outAppPath, '-name', 'kerberos.node']);
 	const lipoOutput = await spawn('lipo', ['-archs', findOutput.replace(/\n$/, '')]);
 	if (lipoOutput.replace(/\n$/, '') !== 'x86_64 arm64') {
 		throw new Error(`Invalid arch, got : ${lipoOutput}`);

extensions/github-authentication/src/common/keychain.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// keytar depends on a native module shipped in vscode, so this is
-// how we load it
 import * as vscode from 'vscode';
 import { Log } from './logger';
 

extensions/microsoft-authentication/extension-browser.webpack.config.js

@@ -20,9 +20,6 @@ module.exports = withBrowserDefaults({
 	entry: {
 		extension: './src/extension.ts',
 	},
-	externals: {
-		'keytar': 'commonjs keytar',
-	},
 	resolve: {
 		alias: {
 			'./node/crypto': path.resolve(__dirname, 'src/browser/crypto'),

extensions/microsoft-authentication/extension.webpack.config.js

@@ -12,9 +12,6 @@ const withDefaults = require('../shared.webpack.config');
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/extension.ts',
-	},
-	externals: {
-		'keytar': 'commonjs keytar'
+		extension: './src/extension.ts'
 	}
 });

extensions/vscode-api-tests/src/singlefolder-tests/languagedetection.test.ts

@@ -36,7 +36,6 @@ suite('vscode - automatic language detection', () => {
 		"outDir": "../out/vs",
 		"target": "es2020",
 		"types": [
-			"keytar",
 			"mocha",
 			"semver",
 			"sinon",

package.json

@@ -84,7 +84,6 @@
     "https-proxy-agent": "^2.2.3",
     "jschardet": "3.0.0",
     "kerberos": "^2.0.1",
-    "keytar": "7.9.0",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.4",
@@ -118,7 +117,6 @@
     "@types/gulp-svgmin": "^1.2.1",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
-    "@types/keytar": "^4.4.0",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "18.x",

remote/package.json

@@ -19,7 +19,6 @@
     "https-proxy-agent": "^2.2.3",
     "jschardet": "3.0.0",
     "kerberos": "^2.0.1",
-    "keytar": "7.9.0",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta1",