From 4a453a92c584856bd076f661102385aaf7f05c97 Mon Sep 17 00:00:00 2001 From: Brandon Wilson Date: Mon, 28 Nov 2022 12:53:20 -0600 Subject: [PATCH] chore(backend): import open-payments generateJwk --- .../backend/src/paymentPointerKey/routes.test.ts | 11 +++++------ packages/backend/src/paymentPointerKey/routes.ts | 12 +++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/backend/src/paymentPointerKey/routes.test.ts b/packages/backend/src/paymentPointerKey/routes.test.ts index 6af6ad0795..c0841cb4a9 100644 --- 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 => { 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({ headers: { Accept: 'application/json' }, diff --git a/packages/backend/src/paymentPointerKey/routes.ts b/packages/backend/src/paymentPointerKey/routes.ts index 0ce049f5ba..54eb3c232f 100644 --- 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 {