@shipfox/annotations 6.0.0 → 8.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/annotations",
   "license": "MIT",
-  "version": "6.0.0",
+  "version": "8.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -25,31 +25,14 @@
     "drizzle-orm": "^0.45.2",
     "zod": "^4.4.3",
     "@shipfox/annotations-dto": "6.0.0",
-    "@shipfox/api-auth-context": "6.0.0",
+    "@shipfox/api-auth-context": "7.1.0",
     "@shipfox/config": "1.2.2",
     "@shipfox/inter-module": "0.2.0",
     "@shipfox/node-drizzle": "0.3.2",
-    "@shipfox/node-fastify": "0.2.4",
-    "@shipfox/node-module": "0.4.0",
+    "@shipfox/node-fastify": "0.3.0",
+    "@shipfox/node-module": "0.5.0",
     "@shipfox/node-postgres": "0.4.2"
   },
-  "devDependencies": {
-    "@types/pg": "^8.15.5",
-    "drizzle-kit": "^0.31.10",
-    "fastify": "^5.3.3",
-    "fastify-type-provider-zod": "^6.0.0",
-    "fishery": "^2.4.0",
-    "@shipfox/node-auth-root-key": "0.2.0",
-    "@shipfox/api-auth": "6.0.0",
-    "@shipfox/api-auth-dto": "6.0.0",
-    "@shipfox/biome": "1.8.2",
-    "@shipfox/depcruise": "1.0.2",
-    "@shipfox/node-jwt": "0.3.0",
-    "@shipfox/swc": "1.2.6",
-    "@shipfox/ts-config": "1.3.8",
-    "@shipfox/typescript": "1.1.7",
-    "@shipfox/vitest": "1.2.3"
-  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/presentation/routes/write-annotations.test.ts

@@ -1,10 +1,9 @@
-import {createLeaseTokenAuthMethod} from '@shipfox/api-auth';
 import {AUTH_LEASED_JOB} from '@shipfox/api-auth-context';
 import {closeApp, createApp, type FastifyInstance} from '@shipfox/node-fastify';
 import {eq} from 'drizzle-orm';
 import {db} from '#db/db.js';
 import {annotations} from '#db/schema/annotations.js';
-import {mintLeaseToken} from '#test/index.js';
+import {fakeLeaseTokenAuthMethod, mintLeaseToken} from '#test/index.js';
 import {writeAnnotationsRoute} from './write-annotations.js';
 
 function annotationsUrl(): string {
@@ -31,7 +30,7 @@ describe('POST /runs/jobs/current/annotations', () => {
 
   beforeAll(async () => {
     app = await createApp({
-      auth: [createLeaseTokenAuthMethod()],
+      auth: [fakeLeaseTokenAuthMethod],
       routes: [
         {prefix: '/runs/jobs/current', auth: AUTH_LEASED_JOB, routes: [writeAnnotationsRoute]},
       ],

package/test/fixtures/lease-token.ts

@@ -1,8 +1,8 @@
-import {JOB_LEASE_TOKEN_AUDIENCE} from '@shipfox/api-auth-dto';
-import {jobLeaseTokenKey} from '@shipfox/node-auth-root-key';
-import {signHs256} from '@shipfox/node-jwt';
+import {AUTH_LEASED_JOB, setLeasedJobContext} from '@shipfox/api-auth-context';
+import {JOB_LEASE_TOKEN_AUDIENCE, type JobLeaseTokenClaims} from '@shipfox/api-auth-dto';
+import {type AuthMethod, ClientError, extractBearerToken} from '@shipfox/node-fastify';
 
-const SECRET = jobLeaseTokenKey();
+const leaseClaims = new Map<string, JobLeaseTokenClaims>();
 
 export interface MintLeaseTokenParams {
   jobId: string;
@@ -14,31 +14,36 @@ export interface MintLeaseTokenParams {
   workflowRunAttemptId?: string;
   currentStepId?: string;
   currentStepAttempt?: number;
-  secret?: string;
-  expiresIn?: string;
-  audience?: string;
 }
 
 export function mintLeaseToken(params: MintLeaseTokenParams): Promise<string> {
-  return signHs256({
-    payload: {
-      jobId: params.jobId,
-      jobExecutionId: params.jobExecutionId,
-      workflowRunId: params.workflowRunId ?? crypto.randomUUID(),
-      workflowRunAttempt: params.workflowRunAttempt ?? 1,
-      workflowRunAttemptId: params.workflowRunAttemptId ?? crypto.randomUUID(),
-      projectId: params.projectId ?? crypto.randomUUID(),
-      workspaceId: params.workspaceId ?? crypto.randomUUID(),
-      runnerSessionId: crypto.randomUUID(),
-      ...(params.currentStepId && params.currentStepAttempt !== undefined
-        ? {
-            currentStepId: params.currentStepId,
-            currentStepAttempt: params.currentStepAttempt,
-          }
-        : {}),
-    },
-    secret: params.secret ?? SECRET,
-    expiresIn: params.expiresIn ?? '90m',
-    audience: params.audience ?? JOB_LEASE_TOKEN_AUDIENCE,
+  const token = `test-auth-${crypto.randomUUID()}`;
+  leaseClaims.set(token, {
+    jobId: params.jobId,
+    jobExecutionId: params.jobExecutionId,
+    workflowRunId: params.workflowRunId ?? crypto.randomUUID(),
+    workflowRunAttempt: params.workflowRunAttempt ?? 1,
+    workflowRunAttemptId: params.workflowRunAttemptId ?? crypto.randomUUID(),
+    projectId: params.projectId ?? crypto.randomUUID(),
+    workspaceId: params.workspaceId ?? crypto.randomUUID(),
+    runnerSessionId: crypto.randomUUID(),
+    ...(params.currentStepId && params.currentStepAttempt !== undefined
+      ? {currentStepId: params.currentStepId, currentStepAttempt: params.currentStepAttempt}
+      : {}),
+    aud: JOB_LEASE_TOKEN_AUDIENCE,
+    iat: 0,
+    exp: Number.MAX_SAFE_INTEGER,
   });
+  return Promise.resolve(token);
 }
+
+export const fakeLeaseTokenAuthMethod: AuthMethod = {
+  name: AUTH_LEASED_JOB,
+  authenticate: (request) => {
+    const token = extractBearerToken(request.headers.authorization);
+    const claims = token ? leaseClaims.get(token) : undefined;
+    if (!claims) throw new ClientError('Authentication required', 'unauthorized', {status: 401});
+    setLeasedJobContext(request, claims);
+    return Promise.resolve();
+  },
+};

package/test/index.ts

@@ -1,2 +1,2 @@
 export {annotationFactory} from './factories/annotation.js';
-export {mintLeaseToken} from './fixtures/lease-token.js';
+export {fakeLeaseTokenAuthMethod, mintLeaseToken} from './fixtures/lease-token.js';