From f49e753801851758b5d2fa1240e2d1b0c7d4661f Mon Sep 17 00:00:00 2001
From: Richard Schneider <makaretu@gmail.com>
Date: Fri, 8 Dec 2017 14:45:02 +1300
Subject: [PATCH] fix: return info on removed key #10

---
 src/keychain.js       | 9 +++++----
 test/keychain.spec.js | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/keychain.js b/src/keychain.js
index f4e4b0f..e71cfa3 100644
--- a/src/keychain.js
+++ b/src/keychain.js
@@ -186,11 +186,12 @@ class Keychain {
       return _error(callback, `Invalid key name '${name}'`)
     }
     const dsname = DsName(name)
-    self.store.has(dsname, (err, exists) => {
+    self._getKeyInfo(name, (err, keyinfo) => {
       if (err) return _error(callback, err)
-      if (!exists) return _error(callback, `Key '${name}' does not exist'`)
-
-      self.store.delete(dsname, callback)
+      self.store.delete(dsname, (err) => {
+        if (err) return _error(callback, err)
+        callback(null, keyinfo)
+      })
     })
   }
 
diff --git a/test/keychain.spec.js b/test/keychain.spec.js
index 4f526ac..d0b61bc 100644
--- a/test/keychain.spec.js
+++ b/test/keychain.spec.js
@@ -345,8 +345,11 @@ module.exports = (datastore1, datastore2) => {
       })
 
       it('can remove a known key', (done) => {
-        ks.removeKey(renamedRsaKeyName, (err) => {
+        ks.removeKey(renamedRsaKeyName, (err, key) => {
           expect(err).to.not.exist()
+          expect(key).to.exist()
+          expect(key).to.have.property('name', renamedRsaKeyName)
+          expect(key).to.have.property('id', rsaKeyInfo.id)
           done()
         })
       })