@shipfox/api-integration-gitea 10.2.0 → 12.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/api-integration-gitea",
   "license": "MIT",
-  "version": "10.2.0",
+  "version": "12.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -19,14 +19,14 @@
   },
   "dependencies": {
     "drizzle-orm": "^0.45.2",
-    "@shipfox/api-auth-context": "10.2.0",
-    "@shipfox/api-integration-spi": "0.2.2",
-    "@shipfox/api-integration-gitea-dto": "9.0.2",
+    "@shipfox/api-auth-context": "12.0.0",
+    "@shipfox/api-integration-spi": "1.0.0",
+    "@shipfox/api-integration-gitea-dto": "12.0.0",
     "@shipfox/config": "1.2.4",
-    "@shipfox/node-drizzle": "0.3.4",
-    "@shipfox/node-fastify": "0.4.0",
+    "@shipfox/node-drizzle": "0.3.5",
+    "@shipfox/node-fastify": "0.4.1",
     "@shipfox/node-opentelemetry": "0.6.3",
-    "@shipfox/node-postgres": "0.4.4"
+    "@shipfox/node-postgres": "0.5.0"
   },
   "imports": {
     "#*": "./dist/*"

package/src/core/source-control.test.ts

@@ -3,6 +3,8 @@ import type {GiteaApiClient, GiteaRepository} from '#api/client.js';
 import {GiteaIntegrationProviderError} from './errors.js';
 import {GiteaSourceControlProvider} from './source-control.js';
 
+const VALID_COMMIT = 'a'.repeat(40);
+
 const REPOSITORY: GiteaRepository = {
   ownerLogin: 'shipfox',
   name: 'platform',
@@ -53,6 +55,119 @@ function connection(): IntegrationConnection<'gitea'> {
 }
 
 describe('GiteaSourceControlProvider', () => {
+  it('normalizes push trigger references', () => {
+    const provider = new GiteaSourceControlProvider(giteaClient());
+
+    const result = provider.resolveTriggerReference({
+      ref: 'refs/heads/feature/review',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform'},
+      sender: {login: 'noe'},
+    });
+
+    expect(result).toEqual({
+      externalRepositoryId: 'gitea:shipfox/platform',
+      ref: 'refs/heads/feature/review',
+      commit: VALID_COMMIT,
+      actor: 'noe',
+    });
+  });
+
+  it('falls back to the sender username when no login is present', () => {
+    const provider = new GiteaSourceControlProvider(giteaClient());
+
+    const result = provider.resolveTriggerReference({
+      ref: 'refs/heads/main',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform'},
+      sender: {username: 'noe'},
+    });
+
+    expect(result).toMatchObject({actor: 'noe'});
+  });
+
+  it('resolves a null actor when the payload names no sender', () => {
+    const provider = new GiteaSourceControlProvider(giteaClient());
+
+    const result = provider.resolveTriggerReference({
+      ref: 'refs/heads/main',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform'},
+    });
+
+    expect(result).toMatchObject({actor: null});
+  });
+
+  it('normalizes pull-request trigger references from the head repository', () => {
+    const provider = new GiteaSourceControlProvider(giteaClient());
+
+    const result = provider.resolveTriggerReference({
+      repository: {full_name: 'shipfox/platform'},
+      sender: {login: 'noe'},
+      pull_request: {
+        number: 17,
+        head: {
+          sha: VALID_COMMIT,
+          repo: {full_name: 'shipfox/platform'},
+        },
+        base: {repo: {full_name: 'shipfox/platform'}},
+      },
+    });
+
+    expect(result).toEqual({
+      externalRepositoryId: 'gitea:shipfox/platform',
+      ref: 'refs/pull/17/head',
+      commit: VALID_COMMIT,
+      actor: 'noe',
+    });
+  });
+
+  it.each([
+    undefined,
+    {},
+    {ref: 'refs/heads/main', after: VALID_COMMIT},
+    {
+      ref: 'refs/heads/feature branch',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform'},
+    },
+    {
+      ref: 'refs/heads/feature..branch',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform'},
+    },
+    {
+      ref: 'refs/heads/main',
+      after: '0'.repeat(40),
+      repository: {full_name: 'shipfox/platform'},
+    },
+    {
+      ref: 'refs/heads/main',
+      after: 'not-a-commit',
+      repository: {full_name: 'shipfox/platform'},
+    },
+    {ref: 'refs/heads/main', after: VALID_COMMIT, repository: {full_name: 'shipfox'}},
+    {
+      ref: 'refs/heads/main',
+      after: VALID_COMMIT,
+      repository: {full_name: 'shipfox/platform/extra'},
+    },
+    {
+      repository: {full_name: 'shipfox/platform'},
+      pull_request: {
+        number: 17,
+        head: {sha: VALID_COMMIT, repo: {full_name: 'fork/platform'}},
+        base: {repo: {full_name: 'shipfox/platform'}},
+      },
+    },
+  ])('returns null for an unresolvable or unsafe trigger payload', (payload) => {
+    const provider = new GiteaSourceControlProvider(giteaClient());
+
+    const result = provider.resolveTriggerReference(payload);
+
+    expect(result).toBeNull();
+  });
+
   it('lists org repositories scoped to the connection account', async () => {
     const gitea = giteaClient();
     const provider = new GiteaSourceControlProvider(gitea);

package/src/core/source-control.ts

@@ -1,6 +1,7 @@
 import {Buffer} from 'node:buffer';
 import {giteaProviderKind} from '@shipfox/api-integration-gitea-dto';
 import {
+  asRecord,
   buildProviderRepositoryId,
   type CheckoutSpec,
   type CreateCheckoutSpecInput,
@@ -8,15 +9,21 @@ import {
   type FilePage,
   type FileSnapshot,
   type IntegrationConnection,
+  isRecord,
+  isValidGitObjectId,
+  isValidTriggerRef,
   type ListFilesInput,
   type ListRepositoriesInput,
   MAX_REPOSITORY_FILE_BYTES,
+  nonEmptyString,
   parseProviderRepositoryId,
+  positiveInteger,
   type RepositoryPage,
   type RepositorySnapshot,
   type RepositoryVisibility,
   type ResolveRepositoryInput,
   type SourceControlProvider,
+  type TriggerReference,
 } from '@shipfox/api-integration-spi';
 import type {GiteaApiClient, GiteaRepository} from '#api/client.js';
 import {config, giteaCloneBaseOrigin} from '#config.js';
@@ -134,6 +141,48 @@ export class GiteaSourceControlProvider
     };
   }
 
+  resolveTriggerReference(payload: unknown): TriggerReference | null {
+    if (!isRecord(payload)) return null;
+
+    const actor = giteaEventActor(payload);
+    const pullRequest = asRecord(payload.pull_request);
+    if (pullRequest) {
+      const head = asRecord(pullRequest.head);
+      const repository = asRecord(head?.repo);
+      const base = asRecord(pullRequest.base);
+      const baseRepository = asRecord(base?.repo) ?? asRecord(payload.repository);
+      if (!repository || !baseRepository || !sameGiteaRepository(repository, baseRepository)) {
+        return null;
+      }
+      const repositoryId = giteaRepositoryId(repository);
+      const number = positiveInteger(pullRequest.number);
+      const commit = nonEmptyString(head?.sha);
+      const ref = number === null ? null : `refs/pull/${number}/head`;
+      if (!repositoryId || !ref || !commit) return null;
+      const hasValidReference = isValidGitObjectId(commit) && isValidTriggerRef(ref);
+      if (!hasValidReference) return null;
+      return {
+        externalRepositoryId: buildProviderRepositoryId(giteaProviderKind, repositoryId),
+        ref,
+        commit,
+        actor,
+      };
+    }
+
+    const repositoryId = giteaRepositoryId(asRecord(payload.repository));
+    const ref = nonEmptyString(payload.ref);
+    const commit = nonEmptyString(payload.after);
+    if (!repositoryId || !ref || !commit) return null;
+    const hasValidReference = isValidGitObjectId(commit) && isValidTriggerRef(ref);
+    if (!hasValidReference) return null;
+    return {
+      externalRepositoryId: buildProviderRepositoryId(giteaProviderKind, repositoryId),
+      ref,
+      commit,
+      actor,
+    };
+  }
+
   async createCheckoutSpec(
     input: CreateCheckoutSpecInput<GiteaIntegrationConnection>,
   ): Promise<CheckoutSpec> {
@@ -160,6 +209,31 @@ export class GiteaSourceControlProvider
   }
 }
 
+function giteaRepositoryId(repository: Record<string, unknown> | null): string | null {
+  const fullName = nonEmptyString(repository?.full_name);
+  if (!fullName) return null;
+  const separatorIndex = fullName.indexOf('/');
+  const owner = separatorIndex > 0 ? fullName.slice(0, separatorIndex) : '';
+  const repo = separatorIndex > 0 ? fullName.slice(separatorIndex + 1) : '';
+  return owner && repo && !repo.includes('/') ? `${owner}/${repo}` : null;
+}
+
+// Gitea mirrors GitHub's webhook envelope but names the handle `username` on some events
+// and `login` on others, so both are read before giving up on an actor.
+function giteaEventActor(payload: Record<string, unknown>): string | null {
+  const sender = asRecord(payload.sender);
+  return nonEmptyString(sender?.login) ?? nonEmptyString(sender?.username);
+}
+
+function sameGiteaRepository(
+  first: Record<string, unknown>,
+  second: Record<string, unknown>,
+): boolean {
+  const firstId = giteaRepositoryId(first);
+  const secondId = giteaRepositoryId(second);
+  return Boolean(firstId && secondId && firstId.toLowerCase() === secondId.toLowerCase());
+}
+
 function createCheckoutRepositoryUrl(cloneUrl: string): string {
   if (!giteaCloneBaseOrigin) return cloneUrl;
 

package/src/presentation/routes/connections.test.ts

@@ -116,7 +116,7 @@ describe('Gitea connection routes', () => {
   it('connects an org and returns the connection DTO', async () => {
     const app = await createTestApp();
     const workspaceId = crypto.randomUUID();
-    authenticatedMemberships = [{workspaceId, role: 'admin'}];
+    authenticatedMemberships = [{workspaceId, role: 'admin', workspaceStatus: 'active'}];
 
     const res = await app.inject({
       method: 'POST',
@@ -137,7 +137,7 @@ describe('Gitea connection routes', () => {
       gitea: giteaClient({organizationExists: vi.fn(() => Promise.resolve(false))}),
     });
     const workspaceId = crypto.randomUUID();
-    authenticatedMemberships = [{workspaceId, role: 'admin'}];
+    authenticatedMemberships = [{workspaceId, role: 'admin', workspaceStatus: 'active'}];
 
     const res = await app.inject({
       method: 'POST',
@@ -152,7 +152,7 @@ describe('Gitea connection routes', () => {
 
   it('returns 409 when the org is already linked to another workspace', async () => {
     const workspaceId = crypto.randomUUID();
-    authenticatedMemberships = [{workspaceId, role: 'admin'}];
+    authenticatedMemberships = [{workspaceId, role: 'admin', workspaceStatus: 'active'}];
     const app = await createTestApp({
       existingConnection: {
         id: crypto.randomUUID(),
@@ -180,7 +180,7 @@ describe('Gitea connection routes', () => {
 
   it('returns 409 when connection slug allocation conflicts repeatedly', async () => {
     const workspaceId = crypto.randomUUID();
-    authenticatedMemberships = [{workspaceId, role: 'admin'}];
+    authenticatedMemberships = [{workspaceId, role: 'admin', workspaceStatus: 'active'}];
     const app = await createTestApp({
       connectGiteaConnection: vi.fn(() =>
         Promise.reject(new ConnectionSlugConflictError(new Error('duplicate slug'))),