refactor: finish Vault migration for private keys (#996)

poetapp · Sep 20, 2019 · 0808593 · 0808593
1 parent 5644ed4
commit 0808593
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 110 deletions.
diff --git a/src/api/works/CreateWork.ts b/src/api/works/CreateWork.ts
@@ -1,7 +1,6 @@
 import * as Joi from 'joi'
 
 import { WorkController } from '../../controllers/WorkController'
-import { Vault } from '../../utils/Vault/Vault'
 
 export const CreateWorkSchema = () => ({
   '@context': Joi.alternatives(

diff --git a/src/controllers/WorkController.ts b/src/controllers/WorkController.ts
@@ -9,7 +9,6 @@ import { pipeP } from 'ramda'
 import { PoetNode, WorkSearchFilters } from '../daos/PoetNodeDao'
 import { decrypt } from '../helpers/crypto'
 import { Network } from '../interfaces/Network'
-import { Vault } from '../utils/Vault/Vault'
 
 export interface WorkController {
   readonly getById: (id: string, network: Network) => Promise<SignedVerifiableClaim>
@@ -76,9 +75,7 @@ export const WorkController = ({
       },
     }
 
-    const privateKey = encryptedPrivateKey.startsWith('vault')
-      ? await Vault.decrypt(encryptedPrivateKey)
-      : decrypt(encryptedPrivateKey, privateKeyEncryptionKey)
+    const privateKey = decrypt(encryptedPrivateKey, privateKeyEncryptionKey)
 
     const createAndSignClaim = pipeP(
       configureCreateVerifiableClaim({ issuer, context: { ...legacyContext, ...context, ...aboutContext} }),

diff --git a/src/scripts/migrate-private-keys.ts b/src/scripts/migrate-private-keys.ts