fix: remove http api support for key.export

Author: jacobheun

packages/interface-ipfs-core/src/key/export.js

@@ -2,6 +2,7 @@
 'use strict'
 
 const { nanoid } = require('nanoid')
+const keys = require('libp2p-crypto/src/keys')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const testTimeout = require('../utils/test-timeout')
 
@@ -26,24 +27,24 @@ module.exports = (common, options) => {
     it('should respect timeout option when importing a key', async () => {
       const password = nanoid()
 
-      const pem = await ipfs.key.export('self', password)
-      expect(pem).to.exist()
+      const key = await keys.generateKeyPair('ed25519')
+      const exported = key.export(password)
 
-      await testTimeout(() => ipfs.key.import('derp', pem, password, {
+      await testTimeout(() => ipfs.key.import('derp', exported, password, {
         timeout: 1
       }))
     })
 
     it('should import an exported key', async () => {
       const password = nanoid()
 
-      const pem = await ipfs.key.export('self', password)
-      expect(pem).to.exist()
+      const key = await keys.generateKeyPair('ed25519')
+      const exported = await key.export(password)
 
-      const key = await ipfs.key.import('clone', pem, password)
-      expect(key).to.exist()
-      expect(key).to.have.property('name', 'clone')
-      expect(key).to.have.property('id')
+      const importedKey = await ipfs.key.import('clone', exported, password)
+      expect(importedKey).to.exist()
+      expect(importedKey).to.have.property('name', 'clone')
+      expect(importedKey).to.have.property('id')
     })
   })
 }

packages/interface-ipfs-core/src/key/import.js

@@ -6,7 +6,6 @@ const tests = {
   list: require('./list'),
   rename: require('./rename'),
   rm: require('./rm'),
-  export: require('./export'),
   import: require('./import')
 }
 

packages/interface-ipfs-core/src/key/index.js

@@ -5,6 +5,5 @@ module.exports = config => ({
   list: require('./list')(config),
   rename: require('./rename')(config),
   rm: require('./rm')(config),
-  export: require('./export')(config),
   import: require('./import')(config)
 })

packages/ipfs-http-client/src/key/export.js

@@ -181,50 +181,6 @@ exports.gen = {
   }
 }
 
-exports.export = {
-  options: {
-    validate: {
-      options: {
-        allowUnknown: true,
-        stripUnknown: true
-      },
-      query: Joi.object().keys({
-        name: Joi.string().required(),
-        password: Joi.string().required(),
-        timeout: Joi.timeout()
-      })
-        .rename('arg', 'name', {
-          override: true,
-          ignoreUndefined: true
-        })
-    }
-  },
-  handler: async (request, h) => {
-    const {
-      app: {
-        signal
-      },
-      server: {
-        app: {
-          ipfs
-        }
-      },
-      query: {
-        name,
-        password,
-        timeout
-      }
-    } = request
-
-    const pem = await ipfs.key.export(name, password, {
-      signal,
-      timeout
-    })
-
-    return h.response(pem).type('application/x-pem-file')
-  }
-}
-
 exports.import = {
   options: {
     validate: {

packages/ipfs-http-client/src/key/index.js

@@ -23,11 +23,6 @@ module.exports = [
     path: '/api/v0/key/rename',
     ...resources.key.rename
   },
-  {
-    method: 'POST',
-    path: '/api/v0/key/export',
-    ...resources.key.export
-  },
   {
     method: 'POST',
     path: '/api/v0/key/import',

packages/ipfs/src/http/api/resources/key.js

@@ -18,7 +18,6 @@ describe('/key', function () {
         rm: sinon.stub(),
         rename: sinon.stub(),
         gen: sinon.stub(),
-        export: sinon.stub(),
         import: sinon.stub()
       }
     }
@@ -228,50 +227,6 @@ describe('/key', function () {
     })
   })
 
-  describe('/export', () => {
-    const defaultOptions = {
-      signal: sinon.match.instanceOf(AbortSignal),
-      timeout: undefined
-    }
-
-    it('only accepts POST', () => {
-      return testHttpMethod('/api/v0/key/export')
-    })
-
-    it('should export a key', async () => {
-      const name = 'name'
-      const password = 'password'
-
-      ipfs.key.export.withArgs(name, password, defaultOptions).returns('pem')
-
-      const res = await http({
-        method: 'POST',
-        url: `/api/v0/key/export?arg=${name}&password=${password}`
-      }, { ipfs })
-
-      expect(res).to.have.property('statusCode', 200)
-      expect(res).to.have.property('result', 'pem')
-    })
-
-    it('accepts a timeout', async () => {
-      const name = 'name'
-      const password = 'password'
-
-      ipfs.key.export.withArgs(name, password, {
-        ...defaultOptions,
-        timeout: 1000
-      }).returns('pem')
-
-      const res = await http({
-        method: 'POST',
-        url: `/api/v0/key/export?arg=${name}&password=${password}&timeout=1s`
-      }, { ipfs })
-
-      expect(res).to.have.property('statusCode', 200)
-      expect(res).to.have.property('result', 'pem')
-    })
-  })
-
   describe('/import', () => {
     const defaultOptions = {
       signal: sinon.match.instanceOf(AbortSignal),