chore(backend): import open-payments generateJwk

interledger · Nov 28, 2022 · 4a453a9 · 4a453a9
1 parent 417e6a3
commit 4a453a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/packages/backend/src/paymentPointerKey/routes.test.ts b/packages/backend/src/paymentPointerKey/routes.test.ts
@@ -1,6 +1,6 @@
-import { createPublicKey } from 'crypto'
 import jestOpenAPI from 'jest-openapi'
 import { Knex } from 'knex'
+import { generateJwk } from 'open-payments'
 import { v4 as uuid } from 'uuid'
 
 import { createContext } from '../tests/context'
@@ -101,11 +101,10 @@ describe('Payment Pointer Keys Routes', (): void => {
 
     test('returns 200 with backend key', async (): Promise<void> => {
       const config = await deps.use('config')
-      const jwk = {
-        ...createPublicKey(config.privateKey).export({ format: 'jwk' }),
-        kid: config.keyId,
-        alg: 'EdDSA'
-      }
+      const jwk = generateJwk({
+        privateKey: config.privateKey,
+        keyId: config.keyId
+      })
 
       const ctx = createContext<PaymentPointerContext>({
         headers: { Accept: 'application/json' },

diff --git a/packages/backend/src/paymentPointerKey/routes.ts b/packages/backend/src/paymentPointerKey/routes.ts
@@ -1,5 +1,4 @@
-import { createPublicKey } from 'crypto'
-import { JWK } from 'open-payments'
+import { generateJwk, JWK } from 'open-payments'
 
 import { PaymentPointerContext } from '../app'
 import { IAppConfig } from '../config/app'
@@ -22,11 +21,10 @@ export function createPaymentPointerKeyRoutes(
 ): PaymentPointerKeyRoutes {
   const deps = {
     ...deps_,
-    jwk: {
-      ...createPublicKey(deps_.config.privateKey).export({ format: 'jwk' }),
-      kid: deps_.config.keyId,
-      alg: 'EdDSA'
-    } as JWK
+    jwk: generateJwk({
+      privateKey: deps_.config.privateKey,
+      keyId: deps_.config.keyId
+    })
   }
 
   return {