fix: update types

Author: njlie

packages/open-payments/src/client/grant.test.ts

@@ -132,7 +132,7 @@ describe('grant', (): void => {
                 client,
                 ...deps
               }).request({ url }, testGrantRequest as GrantRequest)
-            ).rejects.toThrowError('Invalid Grant Request')
+            ).rejects.toThrow('Invalid Grant Request')
           }
         }
       )

packages/open-payments/src/client/grant.ts

@@ -12,8 +12,8 @@ import {
   GrantContinuation,
   GrantRequest,
   GrantContinuationRequest,
-  OutgoingPaymentLimitWithDebitAmount,
-  OutgoingPaymentLimitWithReceiveAmount
+  AccessOutgoingWithDebitAmount,
+  AccessOutgoingWithReceiveAmount
 } from '../types'
 import { post, deleteRequest } from './requests'
 
@@ -64,13 +64,14 @@ export const createGrantRoutes = (deps: GrantRouteDeps): GrantRoutes => {
         (el) => el.type === 'outgoing-payment'
       )
       if (
-        (outgoingPaymentAccess?.limits as OutgoingPaymentLimitWithDebitAmount)
+        (outgoingPaymentAccess?.limits as AccessOutgoingWithDebitAmount)
           ?.debitAmount &&
-        (outgoingPaymentAccess?.limits as OutgoingPaymentLimitWithReceiveAmount)
+        (outgoingPaymentAccess?.limits as AccessOutgoingWithReceiveAmount)
           ?.receiveAmount
       ) {
         throw new OpenPaymentsClientError('Invalid Grant Request', {
-          description: 'Invalid Request'
+          description:
+            'Only one of "debitAmount" or "receiveAmount" may be specified.'
         })
       }
       return post(

packages/open-payments/src/openapi/index.test.ts

@@ -57,7 +57,7 @@ describe('OpenAPI', (): void => {
             'application/json'
           ]['schema']['properties']['access_token']['properties']['access'][
             'items'
-          ]['oneOf'][1]['properties']['limits']['anyOf'][1]['properties'][
+          ]['oneOf'][1]['properties']['limits']['oneOf'][1]['properties'][
             'debitAmount'
           ]['properties']
         ).sort()

packages/open-payments/src/types.ts

@@ -6,8 +6,7 @@ import {
 import {
   components as ASComponents,
   paths as ASPaths,
-  operations as ASOperations,
-  components
+  operations as ASOperations
 } from './openapi/generated/auth-server-types'
 import {
   components as WAComponents,
@@ -94,7 +93,7 @@ export type GrantContinuation = {
   continue: ASComponents['schemas']['continue']
 }
 export type GrantRequest = {
-  access_token: ASOperations['post-request']['requestBody']['content']['application/json']['access_token']
+  access_token: { access: GrantRequestAccessItem[] }
   client: ASOperations['post-request']['requestBody']['content']['application/json']['client']
   interact?: ASOperations['post-request']['requestBody']['content']['application/json']['interact']
 }
@@ -162,11 +161,34 @@ export const AccessAction: Record<
   ListAll: 'list-all'
 })
 
-export type OutgoingPaymentLimitWithDebitAmount = Extract<
-  ASComponents['schemas']['access-outgoing']['limits'],
-  { debitAmount: components['schemas']['amount'] }
->
-export type OutgoingPaymentLimitWithReceiveAmount = Extract<
-  ASComponents['schemas']['access-outgoing']['limits'],
-  { receiveAmount: components['schemas']['amount'] }
+// From: https://github.com/microsoft/TypeScript/issues/14094#issuecomment-373782604
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never }
+type XOR<T, U> = T | U extends object
+  ? (Without<T, U> & U) | (Without<U, T> & T)
+  : T | U
+type XOR3<T, U, V> = XOR<T, XOR<U, V>>
+export type AccessOutgoingBase = {
+  receiver?: ASComponents['schemas']['receiver']
+  interval?: ASComponents['schemas']['interval']
+}
+export type AccessOutgoingWithDebitAmount = AccessOutgoingBase & {
+  debitAmount: ASComponents['schemas']['amount']
+}
+export type AccessOutgoingWithReceiveAmount = AccessOutgoingBase & {
+  receiveAmount: ASComponents['schemas']['amount']
+}
+export type AccessOutgoingLimits = XOR3<
+  AccessOutgoingBase,
+  AccessOutgoingWithDebitAmount,
+  AccessOutgoingWithReceiveAmount
 >
+export type AccessOutgoing = {
+  type: 'outgoing-payment'
+  actions: ('create' | 'read' | 'read-all' | 'list' | 'list-all')[]
+  identifier: string
+  limits?: AccessOutgoingLimits
+}
+export type GrantRequestAccessItem =
+  | ASComponents['schemas']['access-incoming']
+  | AccessOutgoing
+  | ASComponents['schemas']['access-quote']