fix: rebase conflicts

interledger · Aug 1, 2022 · 30c65a8 · 30c65a8
1 parent 5b0f70b
commit 30c65a8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 63 deletions.
diff --git a/packages/auth/src/accessToken/routes.test.ts b/packages/auth/src/accessToken/routes.test.ts
@@ -315,12 +315,12 @@ describe('Access Token Routes', (): void => {
       const ctx = createContext(
         {
           headers: {
-            Accept: 'application/json',
+            Accept: 'application/json'
           },
           url: `/token/${managementId}`,
           method
         },
-        { managementId }
+        { id: managementId }
       )
 
       await accessTokenRoutes.revoke(ctx)
@@ -339,22 +339,15 @@ describe('Access Token Routes', (): void => {
         proof: 'httpsig',
         resource_server: 'test'
       }
-      const { signature, sigInput, contentDigest } = await generateSigHeaders(
-        url,
-        method
-      )
       const ctx = createContext(
         {
           headers: {
-            Accept: 'application/json',
-            'Content-Digest': contentDigest,
-            Signature: signature,
-            'Signature-Input': sigInput
+            Accept: 'application/json'
           },
           url,
           method
         },
-        { managementId }
+        { id: managementId }
       )
 
       ctx.request.body = requestBody
@@ -376,22 +369,15 @@ describe('Access Token Routes', (): void => {
         proof: 'httpsig',
         resource_server: 'test'
       }
-      const { signature, sigInput, contentDigest } = await generateSigHeaders(
-        url,
-        method
-      )
       const ctx = createContext(
         {
           headers: {
-            Accept: 'application/json',
-            'Content-Digest': contentDigest,
-            Signature: signature,
-            'Signature-Input': sigInput
+            Accept: 'application/json'
           },
           url,
           method
         },
-        { managementId }
+        { id: managementId }
       )
 
       ctx.request.body = requestBody

diff --git a/packages/auth/src/accessToken/routes.ts b/packages/auth/src/accessToken/routes.ts
@@ -78,36 +78,6 @@ async function revokeToken(
   deps: ServiceDependencies,
   ctx: AppContext
 ): Promise<void> {
-  const sig = ctx.headers['signature']
-  const sigInput = ctx.headers['signature-input']
-
-  if (
-    !sig ||
-    !sigInput ||
-    typeof sig !== 'string' ||
-    typeof sigInput !== 'string'
-  ) {
-    ctx.status = 400
-    ctx.body = {
-      error: 'invalid_request'
-    }
-    return
-  }
-
-  const verified = await deps.clientService.verifySigFromBoundKey(
-    sig,
-    sigInput,
-    'managementId',
-    ctx.params['managementId'],
-    ctx
-  )
-  if (!verified.success) {
-    ctx.status = verified.status || 401
-    ctx.body = {
-      error: verified.error || 'invalid_client'
-    }
-  }
-
   await deps.accessTokenService.revoke(ctx.params['id'])
   ctx.status = 204
 }

diff --git a/packages/auth/src/accessToken/service.test.ts b/packages/auth/src/accessToken/service.test.ts
@@ -81,7 +81,6 @@ describe('Access Token Service', (): void => {
   }
 
   const BASE_TOKEN = {
-    managementId: 'https://example.com/manage/12345',
     expiresIn: 3600
   }
 
@@ -105,7 +104,8 @@ describe('Access Token Service', (): void => {
       token = await AccessToken.query(trx).insertAndFetch({
         grantId: grant.id,
         ...BASE_TOKEN,
-        value: crypto.randomBytes(8).toString('hex').toUpperCase()
+        value: crypto.randomBytes(8).toString('hex').toUpperCase(),
+        managementId: v4()
       })
     }
   )
@@ -201,9 +201,6 @@ describe('Access Token Service', (): void => {
       token = await AccessToken.query(trx).findById(token.id)
       expect(token).toBeUndefined()
     })
-    test('Cannot revoke nonexistent token', async (): Promise<void> => {
-      expect(accessTokenService.revoke('uuid')).resolves.toBeInstanceOf(Error)
-    })
   })
 
   describe('Rotate', (): void => {
@@ -226,7 +223,8 @@ describe('Access Token Service', (): void => {
         token = await AccessToken.query(trx).insertAndFetch({
           grantId: grant.id,
           ...BASE_TOKEN,
-          value: crypto.randomBytes(8).toString('hex').toUpperCase()
+          value: crypto.randomBytes(8).toString('hex').toUpperCase(),
+          managementId: v4()
         })
         originalTokenValue = token.value
       }

diff --git a/packages/auth/src/app.ts b/packages/auth/src/app.ts
@@ -195,7 +195,6 @@ export class App {
                   path,
                   method
                 }),
-                // TODO: httpsig middleware goes here if applicable
                 clientService.tokenHttpsigMiddleware,
                 route
               )
@@ -206,7 +205,6 @@ export class App {
                   path,
                   method
                 }),
-                // TODO: httpsig middleware goes here if applicable
                 route
               )
             }

diff --git a/packages/auth/src/grant/routes.test.ts b/packages/auth/src/grant/routes.test.ts
@@ -18,11 +18,7 @@ import { Access } from '../access/model'
 import { Grant, StartMethod, FinishMethod, GrantState } from '../grant/model'
 import { GrantRequest } from '../grant/service'
 import { AccessToken } from '../accessToken/model'
-import {
-  generateSigHeaders,
-  SIGNATURE_METHOD,
-  SIGNATURE_TARGET_URI
-} from '../tests/signature'
+import { generateSigHeaders } from '../tests/signature'
 
 export const KEY_REGISTRY_ORIGIN = 'https://openpayments.network'
 export const TEST_KID_PATH = '/keys/base-test-key'