Merge branch 'main' into bw-rs-client

.github/workflows/lint_test_build.yml

@@ -64,6 +64,15 @@ jobs:
       - uses: ./.github/workflows/rafiki/env-setup
       - run: pnpm --filter openapi test
 
+  mock-account-provider:
+    runs-on: ubuntu-latest
+    needs: checkout
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/workflows/rafiki/env-setup
+      - run: pnpm --filter mock-account-provider build
+
   open-payments:
     runs-on: ubuntu-latest
     needs: checkout
@@ -82,6 +91,7 @@ jobs:
       - frontend
       - auth
       - openapi
+      - mock-account-provider
       - open-payments
     steps:
       - uses: actions/checkout@v2

packages/auth/scripts/get-op-schema.sh

@@ -9,5 +9,5 @@ while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 OUTDIR=$( cd -P "$( dirname "$SOURCE" )/../src/openapi" >/dev/null 2>&1 && pwd )
 
-curl -o "$OUTDIR/schemas.yaml" https://raw.githubusercontent.com/interledger/open-payments/56d441fe7f1d44f9111ae1a37de536e72407038d/openapi/schemas.yaml
-curl -o "$OUTDIR/auth-server.yaml" https://raw.githubusercontent.com/interledger/open-payments/56d441fe7f1d44f9111ae1a37de536e72407038d/openapi/auth-server.yaml
+curl -o "$OUTDIR/schemas.yaml" https://raw.githubusercontent.com/interledger/open-payments/b363d33038fe789e5388f04f80ddd06a4fa97093/openapi/schemas.yaml
+curl -o "$OUTDIR/auth-server.yaml" https://raw.githubusercontent.com/interledger/open-payments/b363d33038fe789e5388f04f80ddd06a4fa97093/openapi/auth-server.yaml

packages/auth/seeds/development/01_grants.js

@@ -11,8 +11,9 @@ exports.seed = function (knex) {
           startMethod: ['redirect'],
           finishMethod: 'redirect',
           finishUri: 'https://example.com/finish',
+          client: 'https://backend/accounts/gfranklin',
+          clientKeyId: 'keyid-742ab7cd-1624-4d2e-af6e-e15a71638669',
           clientNonce: 'example-client-nonce',
-          clientKeyId: 'http://fynbos/keys/1234',
           continueToken: '566a929a-86bb-41b8-b12d-718fa4ab2db2',
           continueId: '92c98ab7-9240-43b4-a86f-402f1c6fd6f5',
           interactId: 'example-interact-id',
@@ -27,8 +28,9 @@ exports.seed = function (knex) {
           startMethod: ['redirect'],
           finishMethod: 'redirect',
           finishUri: 'http://peer-auth:3006/finish',
+          client: 'https://peer-backend/accounts/pfry',
+          clientKeyId: 'keyid-97a3a431-8ee1-48fc-ac85-70e2f5eba8e5',
           clientNonce: 'example-client-nonce',
-          clientKeyId: 'http://local-bank/keys/1234',
           continueToken: 'fc7d255b-66f7-46f5-af56-65831a110604',
           continueId: '006856cd-a34a-4d4a-bb69-af1e07980834',
           interactId: 'local-bank-interact-id',
@@ -43,8 +45,9 @@ exports.seed = function (knex) {
           startMethod: ['redirect'],
           finishMethod: 'redirect',
           finishUri: 'http://localhost:3300/mock-idp/fake-client?',
+          client: 'https://backend/accounts/gfranklin',
+          clientKeyId: 'keyid-742ab7cd-1624-4d2e-af6e-e15a71638669',
           clientNonce: 'demo-client-nonce',
-          clientKeyId: 'http://fynbos/keys/1234',
           continueToken: '301294e4-db8d-445b-b77e-d27583719ecc',
           continueId: 'edbe6928-7d80-44a8-94b8-514e75759439',
           interactId: 'demo-interact-id',

packages/auth/src/grant/routes.test.ts

@@ -275,7 +275,7 @@ describe('Grant Routes', (): void => {
           value: expect.any(String),
           manage: expect.any(String),
           access: body.access_token.access,
-          expiresIn: 600
+          expires_in: 600
         },
         continue: {
           access_token: {
@@ -865,7 +865,7 @@ describe('Grant Routes', (): void => {
               type: 'incoming-payment'
             }
           ]),
-          expiresIn: 600
+          expires_in: 600
         },
         continue: {
           access_token: {

packages/auth/src/grant/routes.ts

@@ -427,7 +427,7 @@ function createGrantBody({
       value: accessToken.value,
       manage: domain + `/token/${accessToken.managementId}`,
       access: access.map((a: Access) => accessToBody(a)),
-      expiresIn: accessToken.expiresIn
+      expires_in: accessToken.expiresIn
     },
     continue: {
       access_token: {

packages/mock-account-provider/app/lib/crypto.server.ts

@@ -0,0 +1,22 @@
+import { createPublicKey, generateKeyPairSync, type JsonWebKey } from 'crypto'
+
+type OpenPaymentsJWK = JsonWebKey & {
+  alg: 'EdDSA'
+  kid: string
+}
+
+export const generateJwk = ({ keyId }: { keyId: string }): OpenPaymentsJWK => {
+  const jwk = createPublicKey(generateKeyPairSync('ed25519').privateKey).export(
+    {
+      format: 'jwk'
+    }
+  )
+
+  return {
+    alg: 'EdDSA',
+    kid: keyId,
+    kty: jwk.kty,
+    crv: jwk.crv,
+    x: jwk.x
+  }
+}

packages/mock-account-provider/app/lib/requesters.ts

@@ -2,8 +2,10 @@ import { gql } from '@apollo/client'
 import type {
   CreatePeerMutationResponse,
   LiquidityMutationResponse,
-  CreatePaymentPointerMutationResponse,
-  PaymentPointer
+  PaymentPointer,
+  CreatePaymentPointerKeyMutationResponse,
+  CreatePaymentPointerKeyInput,
+  CreatePaymentPointerInput
 } from '../../generated/graphql'
 import { apolloClient } from './apolloClient'
 
@@ -113,7 +115,7 @@ export async function createPaymentPointer(
   accountUrl: string,
   assetCode: string,
   assetScale: number
-): Promise<CreatePaymentPointerMutationResponse> {
+): Promise<PaymentPointer> {
   const createPaymentPointerMutation = gql`
     mutation CreatePaymentPointer($input: CreatePaymentPointerInput!) {
       createPaymentPointer(input: $input) {
@@ -128,27 +130,70 @@ export async function createPaymentPointer(
       }
     }
   `
-  const createPaymentPointerInput = {
-    input: {
-      asset: {
-        code: assetCode,
-        scale: assetScale
-      },
-      url: accountUrl,
-      publicName: accountName
-    }
+  const createPaymentPointerInput: CreatePaymentPointerInput = {
+    asset: {
+      code: assetCode,
+      scale: assetScale
+    },
+    url: accountUrl,
+    publicName: accountName
   }
+
   return apolloClient
     .mutate({
       mutation: createPaymentPointerMutation,
-      variables: createPaymentPointerInput
+      variables: {
+        input: createPaymentPointerInput
+      }
+    })
+    .then(({ data }) => {
+      console.log(data)
+
+      if (
+        !data.createPaymentPointer.success ||
+        !data.createPaymentPointer.paymentPointer
+      ) {
+        throw new Error('Data was empty')
+      }
+
+      return data.createPaymentPointer.paymentPointer
+    })
+}
+
+export async function createPaymentPointerKey({
+  paymentPointerId,
+  jwk
+}: {
+  paymentPointerId: string
+  jwk: string
+}): Promise<CreatePaymentPointerKeyMutationResponse> {
+  const createPaymentPointerKeyMutation = gql`
+    mutation CreatePaymentPointerKey($input: CreatePaymentPointerKeyInput!) {
+      createPaymentPointerKey(input: $input) {
+        code
+        success
+        message
+      }
+    }
+  `
+  const createPaymentPointerKeyInput: CreatePaymentPointerKeyInput = {
+    paymentPointerId,
+    jwk
+  }
+
+  return apolloClient
+    .mutate({
+      mutation: createPaymentPointerKeyMutation,
+      variables: {
+        input: createPaymentPointerKeyInput
+      }
     })
-    .then(({ data }): CreatePaymentPointerMutationResponse => {
+    .then(({ data }): CreatePaymentPointerKeyMutationResponse => {
       console.log(data)
-      if (!data.createPaymentPointer.success) {
+      if (!data.createPaymentPointerKey.success) {
         throw new Error('Data was empty')
       }
-      return data.createPaymentPointer
+      return data.createPaymentPointerKey
     })
 }
 

packages/mock-account-provider/app/lib/run_seed.ts

@@ -4,10 +4,12 @@ import type { SeedInstance, Account, Peering } from './parse_config'
 import {
   createPeer,
   addPeerLiquidity,
-  createPaymentPointer
+  createPaymentPointer,
+  createPaymentPointerKey
 } from './requesters'
 import { v4 } from 'uuid'
 import { mockAccounts } from './accounts.server'
+import { generateJwk } from './crypto.server'
 
 export async function setupFromSeed(config: SeedInstance): Promise<void> {
   const peerResponses = await Promise.all(
@@ -52,7 +54,7 @@ export async function setupFromSeed(config: SeedInstance): Promise<void> {
           false
         )
       }
-      const pp = await createPaymentPointer(
+      const paymentPointer = await createPaymentPointer(
         config.self.graphqlUrl,
         account.name,
         `https://${CONFIG.self.hostname}/${account.path}`,
@@ -62,11 +64,16 @@ export async function setupFromSeed(config: SeedInstance): Promise<void> {
 
       await mockAccounts.setPaymentPointer(
         account.id,
-        pp.paymentPointer?.id,
-        pp.paymentPointer?.url
+        paymentPointer.id,
+        paymentPointer.url
       )
 
-      return pp
+      await createPaymentPointerKey({
+        paymentPointerId: paymentPointer.id,
+        jwk: JSON.stringify(generateJwk({ keyId: `keyid-${account.id}` }))
+      })
+
+      return paymentPointer
     })
   )
   console.log(JSON.stringify(accountResponses, null, 2))

packages/open-payments/src/config.ts

@@ -1,7 +1,7 @@
 export default {
   OPEN_PAYMENTS_RS_OPEN_API_URL:
-    'https://raw.githubusercontent.com/interledger/open-payments/56d441fe7f1d44f9111ae1a37de536e72407038d/openapi/resource-server.yaml',
+    'https://raw.githubusercontent.com/interledger/open-payments/b363d33038fe789e5388f04f80ddd06a4fa97093/openapi/resource-server.yaml',
   OPEN_PAYMENTS_AS_OPEN_API_URL:
-    'https://raw.githubusercontent.com/interledger/open-payments/56d441fe7f1d44f9111ae1a37de536e72407038d/openapi/auth-server.yaml',
+    'https://raw.githubusercontent.com/interledger/open-payments/b363d33038fe789e5388f04f80ddd06a4fa97093/openapi/auth-server.yaml',
   DEFAULT_REQUEST_TIMEOUT_MS: 5_000
 }