Skip to content

Commit f49e753

Browse files
fix: return info on removed key #10
1 parent 506e1d7 commit f49e753

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/keychain.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,12 @@ class Keychain {
186186
return _error(callback, `Invalid key name '${name}'`)
187187
}
188188
const dsname = DsName(name)
189-
self.store.has(dsname, (err, exists) => {
189+
self._getKeyInfo(name, (err, keyinfo) => {
190190
if (err) return _error(callback, err)
191-
if (!exists) return _error(callback, `Key '${name}' does not exist'`)
192-
193-
self.store.delete(dsname, callback)
191+
self.store.delete(dsname, (err) => {
192+
if (err) return _error(callback, err)
193+
callback(null, keyinfo)
194+
})
194195
})
195196
}
196197

test/keychain.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,11 @@ module.exports = (datastore1, datastore2) => {
345345
})
346346

347347
it('can remove a known key', (done) => {
348-
ks.removeKey(renamedRsaKeyName, (err) => {
348+
ks.removeKey(renamedRsaKeyName, (err, key) => {
349349
expect(err).to.not.exist()
350+
expect(key).to.exist()
351+
expect(key).to.have.property('name', renamedRsaKeyName)
352+
expect(key).to.have.property('id', rsaKeyInfo.id)
350353
done()
351354
})
352355
})

0 commit comments

Comments
 (0)