diff --git a/extensions/vscode-account/package.json b/extensions/vscode-account/package.json index 0deacbea46bbb25755e8443f523438ec849b4e78..6466cc596638b1302be866040d16437d4add7b9b 100644 --- a/extensions/vscode-account/package.json +++ b/extensions/vscode-account/package.json @@ -16,21 +16,6 @@ ], "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", "main": "./out/extension.js", - "contributes": { - "configuration": { - "title": "Microsoft Account", - "properties": { - "microsoftAccount.logLevel": { - "type": "string", - "enum": [ - "info", - "trace" - ], - "default": "info" - } - } - } - }, "scripts": { "vscode:prepublish": "npm run compile", "compile": "gulp compile-extension:vscode-account", diff --git a/extensions/vscode-account/src/keychain.ts b/extensions/vscode-account/src/keychain.ts index eb9f54acab3b11a6c35c9badcacf44cc255a2eff..afda7035521d0f1d09c45da45efe604675389e3d 100644 --- a/extensions/vscode-account/src/keychain.ts +++ b/extensions/vscode-account/src/keychain.ts @@ -62,7 +62,6 @@ export class Keychain { async setToken(token: string): Promise { try { - Logger.trace('Writing to keychain', token); return await this.keytar.setPassword(SERVICE_ID, ACCOUNT_ID, token); } catch (e) { Logger.error(`Setting token failed: ${e}`); @@ -85,9 +84,7 @@ export class Keychain { async getToken(): Promise { try { - const result = await this.keytar.getPassword(SERVICE_ID, ACCOUNT_ID); - Logger.trace('Reading from keychain', result); - return result; + return await this.keytar.getPassword(SERVICE_ID, ACCOUNT_ID); } catch (e) { // Ignore Logger.error(`Getting token failed: ${e}`); diff --git a/extensions/vscode-account/src/logger.ts b/extensions/vscode-account/src/logger.ts index d982ee69f0c5f5586130a1c93e1ff63524b9f8a5..b9ed27bd993796637bb3d7703e4c4a0f9d58266b 100644 --- a/extensions/vscode-account/src/logger.ts +++ b/extensions/vscode-account/src/logger.ts @@ -5,25 +5,13 @@ import * as vscode from 'vscode'; -type LogLevel = 'Trace' | 'Info' | 'Error'; - -enum Level { - Trace = 'trace', - Info = 'Info' -} +type LogLevel = 'Info' | 'Error'; class Log { private output: vscode.OutputChannel; - private level: Level; constructor() { this.output = vscode.window.createOutputChannel('Microsoft Authentication'); - this.level = vscode.workspace.getConfiguration('microsoftAccount').get('logLevel') || Level.Info; - vscode.workspace.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('microsoftAccount.logLevel')) { - this.level = vscode.workspace.getConfiguration('microsoftAccount').get('logLevel') || Level.Info; - } - }); } private data2String(data: any): string { @@ -44,12 +32,6 @@ class Log { this.logLevel('Error', message, data); } - public trace(message: string, data?: any): void { - if (this.level === Level.Trace) { - this.logLevel('Trace', message, data); - } - } - public logLevel(level: LogLevel, message: string, data?: any): void { this.output.appendLine(`[${level} - ${this.now()}] ${message}`); if (data) {