Skip to content

Commit 9ad5aeb

Browse files
chrmartichrmarti
committed
Remove credentials code (fixes microsoft#37822)
1 parent c561784 commit 9ad5aeb

10 files changed

Lines changed: 1 addition & 222 deletions

File tree

‎src/vs/code/electron-main/app.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3535
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
3636
import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
3737
import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
38-
import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
39-
import { CredentialsService } from 'vs/platform/credentials/node/credentialsService';
40-
import { CredentialsChannel } from 'vs/platform/credentials/node/credentialsIpc';
4138
import { resolveCommonProperties, machineIdStorageKey, machineIdIpcChannel } from 'vs/platform/telemetry/node/commonProperties';
4239
import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
4340
import product from 'vs/platform/node/product';
@@ -288,7 +285,6 @@ export class CodeApplication {
288285
services.set(IWindowsMainService, new SyncDescriptor(WindowsManager));
289286
services.set(IWindowsService, new SyncDescriptor(WindowsService, this.sharedProcess));
290287
services.set(ILaunchService, new SyncDescriptor(LaunchService));
291-
services.set(ICredentialsService, new SyncDescriptor(CredentialsService));
292288

293289
// Telemtry
294290
if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
@@ -346,9 +342,6 @@ export class CodeApplication {
346342
this.electronIpcServer.registerChannel('windows', windowsChannel);
347343
this.sharedProcessClient.done(client => client.registerChannel('windows', windowsChannel));
348344

349-
const credentialsService = accessor.get(ICredentialsService);
350-
const credentialsChannel = new CredentialsChannel(credentialsService);
351-
this.electronIpcServer.registerChannel('credentials', credentialsChannel);
352345

353346
// Lifecycle
354347
this.lifecycleService.ready();

‎src/vs/platform/credentials/common/credentials.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/vs/platform/credentials/node/credentialsIpc.ts‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/vs/platform/credentials/node/credentialsService.ts‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/vs/workbench/api/electron-browser/extensionHost.contribution.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { LanguageConfigurationFileHandler } from 'vs/workbench/parts/codeEditor/
1717
// --- mainThread participants
1818
import './mainThreadCommands';
1919
import './mainThreadConfiguration';
20-
import './mainThreadCredentials';
2120
import './mainThreadDebugService';
2221
import './mainThreadDecorations';
2322
import './mainThreadDiagnostics';

‎src/vs/workbench/api/electron-browser/mainThreadCredentials.ts‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/vs/workbench/api/node/extHost.api.impl.ts‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFe
3535
import { ExtHostApiCommands } from 'vs/workbench/api/node/extHostApiCommands';
3636
import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
3737
import { ExtHostDebugService } from 'vs/workbench/api/node/extHostDebugService';
38-
import { ExtHostCredentials } from 'vs/workbench/api/node/extHostCredentials';
3938
import { ExtHostWindow } from 'vs/workbench/api/node/extHostWindow';
4039
import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
4140
import URI from 'vs/base/common/uri';
@@ -103,7 +102,6 @@ export function createApiFactory(
103102
const extHostTerminalService = threadService.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(threadService));
104103
const extHostSCM = threadService.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(threadService, extHostCommands));
105104
const extHostTask = threadService.set(ExtHostContext.ExtHostTask, new ExtHostTask(threadService, extHostWorkspace));
106-
const extHostCredentials = threadService.set(ExtHostContext.ExtHostCredentials, new ExtHostCredentials(threadService));
107105
const extHostWindow = threadService.set(ExtHostContext.ExtHostWindow, new ExtHostWindow(threadService));
108106
threadService.set(ExtHostContext.ExtHostExtensionService, extensionService);
109107

@@ -519,21 +517,8 @@ export function createApiFactory(
519517
}
520518
};
521519

522-
// namespace: credentials
523-
const credentials = {
524-
readSecret(service: string, account: string): Thenable<string | undefined> {
525-
return extHostCredentials.readSecret(service, account);
526-
},
527-
writeSecret(service: string, account: string, secret: string): Thenable<void> {
528-
return extHostCredentials.writeSecret(service, account, secret);
529-
},
530-
deleteSecret(service: string, account: string): Thenable<boolean> {
531-
return extHostCredentials.deleteSecret(service, account);
532-
}
533-
};
534-
535520

536-
const api: typeof vscode = {
521+
return <typeof vscode>{
537522
version: pkg.version,
538523
// namespaces
539524
commands,
@@ -606,10 +591,6 @@ export function createApiFactory(
606591
FileChangeType: <any>FileChangeType,
607592
FileType: <any>FileType
608593
};
609-
if (extension.enableProposedApi && extension.isBuiltin) {
610-
api['credentials'] = credentials;
611-
}
612-
return api;
613594
};
614595
}
615596

‎src/vs/workbench/api/node/extHost.protocol.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,6 @@ export interface MainThreadDebugServiceShape extends IDisposable {
417417
$appendDebugConsole(value: string): TPromise<any>;
418418
}
419419

420-
export interface MainThreadCredentialsShape extends IDisposable {
421-
$readSecret(service: string, account: string): Thenable<string | undefined>;
422-
$writeSecret(service: string, account: string, secret: string): Thenable<void>;
423-
$deleteSecret(service: string, account: string): Thenable<boolean>;
424-
}
425-
426420
export interface MainThreadWindowShape extends IDisposable {
427421
$getWindowVisibility(): TPromise<boolean>;
428422
}
@@ -641,9 +635,6 @@ export interface ExtHostDecorationsShape {
641635
$providerDecorations(handle: number, uri: URI): TPromise<DecorationData>;
642636
}
643637

644-
export interface ExtHostCredentialsShape {
645-
}
646-
647638
export interface ExtHostWindowShape {
648639
$onDidChangeWindowFocus(value: boolean): void;
649640
}
@@ -677,7 +668,6 @@ export const MainContext = {
677668
MainThreadExtensionService: createMainId<MainThreadExtensionServiceShape>('MainThreadExtensionService'),
678669
MainThreadSCM: createMainId<MainThreadSCMShape>('MainThreadSCM'),
679670
MainThreadTask: createMainId<MainThreadTaskShape>('MainThreadTask'),
680-
MainThreadCredentials: createMainId<MainThreadCredentialsShape>('MainThreadCredentials'),
681671
MainThreadWindow: createMainId<MainThreadWindowShape>('MainThreadWindow'),
682672
};
683673

@@ -703,6 +693,5 @@ export const ExtHostContext = {
703693
ExtHostSCM: createExtId<ExtHostSCMShape>('ExtHostSCM'),
704694
ExtHostTask: createExtId<ExtHostTaskShape>('ExtHostTask'),
705695
ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace'),
706-
ExtHostCredentials: createExtId<ExtHostCredentialsShape>('ExtHostCredentials'),
707696
ExtHostWindow: createExtId<ExtHostWindowShape>('ExtHostWindow'),
708697
};

‎src/vs/workbench/api/node/extHostCredentials.ts‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/vs/workbench/electron-browser/main.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import { URLChannelClient } from 'vs/platform/url/common/urlIpc';
3939
import { IURLService } from 'vs/platform/url/common/url';
4040
import { WorkspacesChannelClient } from 'vs/platform/workspaces/common/workspacesIpc';
4141
import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
42-
import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
43-
import { CredentialsChannelClient } from 'vs/platform/credentials/node/credentialsIpc';
4442

4543
import fs = require('fs');
4644
gracefulFs.gracefulify(fs); // enable gracefulFs
@@ -202,9 +200,6 @@ function createMainProcessServices(mainProcessClient: ElectronIPCClient): Servic
202200
const workspacesChannel = mainProcessClient.getChannel('workspaces');
203201
serviceCollection.set(IWorkspacesService, new WorkspacesChannelClient(workspacesChannel));
204202

205-
const credentialsChannel = mainProcessClient.getChannel('credentials');
206-
serviceCollection.set(ICredentialsService, new CredentialsChannelClient(credentialsChannel));
207-
208203
return serviceCollection;
209204
}
210205

0 commit comments

Comments
 (0)