Merge pull request #13 from gjsjohnmurray/fix-12

fix #12 add onDidChangePassword event to API and remove test commands

Author: gjsjohnmurray

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.5 (21-Aug-2020)
+* Add onDidChangePassword to API.
+* Remove test commands, which are now provided by our `intersystems-community.vscode-extension-api-tester` extension.
+
 ## 0.0.4 (24-Jul-2020)
 * Support storing passwords in local keychain.
 * Add API that other extensions can use.

package.json

@@ -58,9 +58,6 @@
   },
   "main": "./out/extension",
   "activationEvents": [
-    "onCommand:intersystems-community.servermanager.testPickServer",
-    "onCommand:intersystems-community.servermanager.testPickServerFlushingCachedCredentials",
-    "onCommand:intersystems-community.servermanager.testPickServerDetailed",
     "onCommand:intersystems-community.servermanager.storePassword",
     "onCommand:intersystems-community.servermanager.clearPassword"
   ],
@@ -192,21 +189,6 @@
         "command": "intersystems-community.servermanager.clearPassword",
         "category": "InterSystems Server Manager",
         "title": "Clear Password from Keychain"
-      },
-      {
-        "command": "intersystems-community.servermanager.testPickServer",
-        "category": "InterSystems Server Manager",
-        "title": "Test Server Selection"
-      },
-      {
-        "command": "intersystems-community.servermanager.testPickServerFlushingCachedCredentials",
-        "category": "InterSystems Server Manager",
-        "title": "Test Server Selection (flush cached credentials)"
-      },
-      {
-        "command": "intersystems-community.servermanager.testPickServerDetailed",
-        "category": "InterSystems Server Manager",
-        "title": "Test Server Selection with Details"
       }
     ]
   }

src/commands/managePasswords.ts

@@ -3,8 +3,9 @@ import { extensionId } from '../extension';
 import { Keychain } from '../keychain';
 import { credentialCache } from '../api/getServerSpec';
 
-export async function storePassword() {
+export async function storePassword(): Promise<string> {
     const name = await commonPickServer({matchOnDetail: true});
+    let reply = '';
     if (name) {
         await vscode.window
         .showInputBox({
@@ -22,13 +23,15 @@ export async function storePassword() {
                 new Keychain(name).setPassword(password).then(() => {
                     vscode.window.showInformationMessage(`Password for '${name}' stored in keychain.`);
                 });
+                reply = name;
             }
         })
-     
     }
+    return reply;
 }
 
-export async function clearPassword() {
+export async function clearPassword(): Promise<string> {
+    let reply = '';
     const name = await commonPickServer({matchOnDetail: true});
     if (name) {
         credentialCache[name] = undefined;
@@ -37,10 +40,12 @@ export async function clearPassword() {
             vscode.window.showWarningMessage(`No password for '${name}' found in keychain.`);          
         } else if (await keychain.deletePassword()) {
             vscode.window.showInformationMessage(`Password for '${name}' removed from keychain.`);
+            reply = name;
         } else {
             vscode.window.showWarningMessage(`Failed to remove password for '${name}' from keychain.`);
         }
     }
+    return reply;
 }
 
 async function commonPickServer(options?: vscode.QuickPickOptions): Promise<string | undefined> {

src/commands/testPickServer.ts

@@ -2,7 +2,6 @@
 export const extensionId = 'intersystems-community.servermanager';
 
 import * as vscode from 'vscode';
-import { testPickServer, testPickServerWithoutCachedCredentials as testPickServerFlushingCachedCredentials, testPickServerDetailed } from './commands/testPickServer';
 import { pickServer } from './api/pickServer';
 import { getServerNames } from './api/getServerNames';
 import { getServerSpec } from './api/getServerSpec';
@@ -31,32 +30,27 @@ export interface ServerSpec {
 
 export function activate(context: vscode.ExtensionContext) {
 
+    const _onDidChangePassword = new vscode.EventEmitter<string>();
 
-	// Register the commands
+    // Register the commands
 	context.subscriptions.push(
 		vscode.commands.registerCommand(`${extensionId}.storePassword`, () => {
-            storePassword();
+            storePassword()
+                .then((name) => {
+                    if (name && name.length > 0) {
+                        _onDidChangePassword.fire(name);
+                    }
+                });
         })
     );
 	context.subscriptions.push(
 		vscode.commands.registerCommand(`${extensionId}.clearPassword`, () => {
-            clearPassword();
-        })
-    );
-
-	context.subscriptions.push(
-		vscode.commands.registerCommand(`${extensionId}.testPickServer`, () => {
-            testPickServer();
-        })
-    );
-	context.subscriptions.push(
-		vscode.commands.registerCommand(`${extensionId}.testPickServerFlushingCachedCredentials`, () => {
-            testPickServerFlushingCachedCredentials();
-        })
-    );
-	context.subscriptions.push(
-		vscode.commands.registerCommand(`${extensionId}.testPickServerDetailed`, () => {
-            testPickServerDetailed();
+            clearPassword()
+            .then((name) => {
+                if (name && name.length > 0) {
+                    _onDidChangePassword.fire(name);
+                }
+            });
         })
     );
 
@@ -71,6 +65,10 @@ export function activate(context: vscode.ExtensionContext) {
 
         async getServerSpec(name: string, scope?: vscode.ConfigurationScope, flushCredentialCache: boolean = false): Promise<ServerSpec | undefined> {
             return await getServerSpec(name, scope, flushCredentialCache);
+        },
+
+        onDidChangePassword(): vscode.Event<string> {
+            return _onDidChangePassword.event;
         }
 
     };