Remove keytar

Author: jeanp413

gitpod-web/package.json

@@ -14,7 +14,7 @@
     "url": "https://github.com/gitpod-io/gitpod/issues"
   },
   "engines": {
-    "vscode": "^1.75.0"
+    "vscode": "^1.83.0"
   },
   "enabledApiProposals": [
     "resolvers",
@@ -624,7 +624,6 @@
     "@parcel/watcher": "^2.1.0",
     "@tsconfig/svelte": "^2.0.0",
     "@types/js-yaml": "^4.0.5",
-    "@types/keytar": "^4.4.2",
     "@types/node": "16.x",
     "@types/node-fetch": "^2.5.12",
     "@types/uuid": "8.0.0",

gitpod-web/src/authentication.ts

@@ -3,17 +3,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import type * as keytarType from 'keytar';
 import fetch from 'node-fetch';
 import { Disposable, GitpodExtensionContext } from 'gitpod-shared';
 import Keychain from './util/keychain';
 
-type Keytar = {
-    getPassword: typeof keytarType['getPassword'];
-    setPassword: typeof keytarType['setPassword'];
-    deletePassword: typeof keytarType['deletePassword'];
-};
-
 interface SessionData {
     id: string;
     account?: {
@@ -65,15 +58,7 @@ export class GitpodAuthenticationProvider extends Disposable implements vscode.A
             this.context.logger.info('Reading sessions from keychain...');
             let storedSessions = await this._keychain.getToken();
             if (!storedSessions) {
-                // Fallback to old behavior
-                this.context.logger.warn('Falling back to deprecated keytar logic');
-
-                const keytar: Keytar = require('keytar');
-                storedSessions = await keytar.getPassword(`gitpod-code-gitpod.login`, 'account');
-                if (!storedSessions) {
-                    return []
-                }
-                await keytar.deletePassword(`gitpod-code-gitpod.login`, 'account');
+                return [];
             }
             this.context.logger.info('Got stored sessions!');
 

gitpod-web/webpack.config.js

@@ -20,7 +20,6 @@ const config = {
 		vscode: "commonjs vscode",
 		bufferutil: "bufferutil",
 		"utf-8-validate": "utf-8-validate",
-        "keytar": "commonjs keytar"
 	},
 	resolve: {
 		extensions: ['.ts', '.js']