Delete Account
diff --git a/src/pages/account/moderate/[id]/approve.ts b/src/pages/account/moderate/[id]/[revisionId]/approve.ts
similarity index 72%
rename from src/pages/account/moderate/[id]/approve.ts
rename to src/pages/account/moderate/[id]/[revisionId]/approve.ts
index 2b199f7..4859b3a 100644
--- a/src/pages/account/moderate/[id]/approve.ts
+++ b/src/pages/account/moderate/[id]/[revisionId]/approve.ts
@@ -9,17 +9,15 @@ export const POST: APIRoute = async (context) => {
if (guard instanceof Response) return guard;
const user = guard;
- const { id } = context.params;
- if (!id) return context.redirect('/account/moderate');
+ const { id, revisionId } = context.params;
+ if (!id || !revisionId) return context.redirect('/account/moderate');
const api = createApiClient(env, user.sub);
try {
- await api.approveSubmission(id);
+ await api.approveRevision(id, revisionId);
} catch (e) {
const message =
- e instanceof ApiRequestError
- ? e.message
- : 'Unable to approve submission.';
+ e instanceof ApiRequestError ? e.message : 'Unable to approve revision.';
setFlash(context.session, { category: 'error', title: message });
}
diff --git a/src/pages/account/moderate/[id]/reject.ts b/src/pages/account/moderate/[id]/[revisionId]/reject.ts
similarity index 82%
rename from src/pages/account/moderate/[id]/reject.ts
rename to src/pages/account/moderate/[id]/[revisionId]/reject.ts
index 6d9aaf3..c9b134c 100644
--- a/src/pages/account/moderate/[id]/reject.ts
+++ b/src/pages/account/moderate/[id]/[revisionId]/reject.ts
@@ -10,8 +10,8 @@ export const POST: APIRoute = async (context) => {
if (guard instanceof Response) return guard;
const user = guard;
- const { id } = context.params;
- if (!id) return context.redirect('/account/moderate');
+ const { id, revisionId } = context.params;
+ if (!id || !revisionId) return context.redirect('/account/moderate');
let form: FormData;
try {
@@ -27,17 +27,17 @@ export const POST: APIRoute = async (context) => {
if (!reviewNote) {
setFlash(context.session, {
category: 'error',
- title: 'A reason is required to reject a submission.',
+ title: 'A reason is required to reject a revision.',
});
return context.redirect('/account/moderate');
}
const api = createApiClient(env, user.sub);
try {
- await api.rejectSubmission(id, reviewNote);
+ await api.rejectRevision(id, revisionId, reviewNote);
} catch (e) {
const message =
- e instanceof ApiRequestError ? e.message : 'Unable to reject submission.';
+ e instanceof ApiRequestError ? e.message : 'Unable to reject revision.';
setFlash(context.session, { category: 'error', title: message });
}
diff --git a/src/pages/account/moderate/index.astro b/src/pages/account/moderate/index.astro
index 441ce03..5d6297c 100644
--- a/src/pages/account/moderate/index.astro
+++ b/src/pages/account/moderate/index.astro
@@ -6,7 +6,7 @@ import {
createApiClient,
getApiErrorMessage,
} from '@/lib/api/client';
-import type { Submission, SubmissionStatus } from '@/lib/api/client';
+import type { ExtensionRevision, RevisionStatus } from '@/lib/api/client';
import RejectDialog from '@/components/RejectDialog.astro';
import { formatDate } from '@/lib/format-date';
import { cursorPageUrl } from '@/lib/pagination';
@@ -17,21 +17,21 @@ if (guard instanceof Response) return guard;
const user = guard;
const statusParam = Astro.url.searchParams.get('status');
-const status: SubmissionStatus =
+const status: RevisionStatus =
statusParam === 'approved' || statusParam === 'rejected'
? statusParam
: 'pending';
const api = createApiClient(env, user.sub);
-let submissions: Submission[] = [];
+let revisions: ExtensionRevision[] = [];
let nextCursor: string | null = null;
let hasMore = false;
let loadError: string | null = null;
try {
- const page = await api.listQueue(status, {
+ const page = await api.listModerationQueue(status, {
cursor: Astro.url.searchParams.get('cursor') ?? undefined,
});
- submissions = page.result;
+ revisions = page.result;
nextCursor = page.pagination.next_cursor;
hasMore = page.pagination.has_more;
} catch (error) {
@@ -76,42 +76,45 @@ const nextPageUrl =
{loadError}
) : (
<>
- {submissions.length === 0 ? (
-
- No {status} submissions.
-
+ {revisions.length === 0 ? (
+ No {status} revisions.
) : (
- {submissions.map((s) => (
+ {revisions.map((r) => (
-
-
{s.payload.extension.description}
+ {r.content.description && (
+ {r.content.description}
+ )}
- Full Payload
+ Full Content
- {JSON.stringify(s.payload, null, 2)}
+ {JSON.stringify(r.content, null, 2)}
- {s.status === 'pending' && (
+ {r.status === 'pending' && (
)}
- {s.status === 'pending' && (
+ {r.status === 'pending' && (
)}
- {s.status !== 'pending' && s.review_note && (
+ {r.status !== 'pending' && r.review_note && (
- Note: {s.review_note}
+ Note: {r.review_note}
)}
diff --git a/test/extension-form.test.ts b/test/extension-form.test.ts
new file mode 100644
index 0000000..cbcf496
--- /dev/null
+++ b/test/extension-form.test.ts
@@ -0,0 +1,156 @@
+import { describe, expect, it } from 'vitest';
+import {
+ buildExtensionCreatePayload,
+ buildExtensionUpdatePayload,
+ ExtensionValidationError,
+} from '@/lib/extension-form';
+import type { Extension } from '@/types';
+
+function extensionForm(overrides: Record = {}): FormData {
+ const form = new FormData();
+ form.set('extension_id', 'example');
+ form.set('type', 'mod');
+ form.set('name', 'Example');
+ form.set('description', 'An example extension.');
+ form.set('website', 'example.test');
+ form.set('license_name', 'MIT');
+ form.set('license_url', 'https://example.test/license');
+ form.set('readme', '# Example');
+ form.set('source_type', 'github');
+ form.set('source_repo', 'fossbilling/example');
+ form.set('version_tag', '1.0.0');
+ form.set('release_date', '2026-01-01');
+ form.set('download_url', 'https://example.test/example.zip');
+ form.set('min_fossbilling_version', '0.6.0');
+ for (const [key, value] of Object.entries(overrides)) {
+ form.set(key, value);
+ }
+ return form;
+}
+
+const publishedExtension: Extension = {
+ id: 'example',
+ type: 'mod',
+ name: 'Example',
+ description: 'An example extension.',
+ releases: [
+ {
+ tag: '0.9.0',
+ date: '2025-12-01',
+ download_url: 'https://example.test/example-0.9.0.zip',
+ min_fossbilling_version: '0.5.0',
+ },
+ ],
+ website: 'https://example.test',
+ license: { name: 'MIT' },
+ readme: '# Example',
+ source: { type: 'github', repo: 'fossbilling/example' },
+ version: '0.9.0',
+ download_url: 'https://example.test/example-0.9.0.zip',
+ developer: {
+ id: 'developer',
+ type: 'organization',
+ name: 'Example developer',
+ },
+};
+
+describe('buildExtensionCreatePayload', () => {
+ it('builds a POST /extensions payload with no developer field', () => {
+ const payload = buildExtensionCreatePayload(extensionForm());
+
+ expect(payload).not.toHaveProperty('developer');
+ expect(payload.id).toBe('example');
+ expect(payload.name).toBe('Example');
+ expect(payload.releases).toEqual([
+ {
+ tag: '1.0.0',
+ date: '2026-01-01',
+ download_url: 'https://example.test/example.zip',
+ changelog_url: undefined,
+ min_fossbilling_version: '0.6.0',
+ },
+ ]);
+ });
+
+ it('lowercases the extension id', () => {
+ const payload = buildExtensionCreatePayload(
+ extensionForm({ extension_id: 'Example-ID' }),
+ );
+
+ expect(payload.id).toBe('example-id');
+ });
+
+ it('requires an initial release', () => {
+ const form = extensionForm({ version_tag: '' });
+ form.delete('release_date');
+ form.delete('download_url');
+ form.delete('min_fossbilling_version');
+
+ expect(() => buildExtensionCreatePayload(form)).toThrow(
+ ExtensionValidationError,
+ );
+ });
+});
+
+describe('buildExtensionUpdatePayload', () => {
+ it('carries existing releases through unchanged when no new release is added', () => {
+ const form = extensionForm();
+ form.delete('version_tag');
+ form.delete('release_date');
+ form.delete('download_url');
+ form.delete('min_fossbilling_version');
+
+ const payload = buildExtensionUpdatePayload(form, publishedExtension);
+
+ expect(payload).not.toHaveProperty('developer');
+ expect(payload).not.toHaveProperty('id');
+ expect(payload.releases).toEqual(publishedExtension.releases);
+ expect(payload.version).toBe('0.9.0');
+ });
+
+ it('appends a new release and updates version/download_url when provided', () => {
+ const payload = buildExtensionUpdatePayload(
+ extensionForm(),
+ publishedExtension,
+ );
+
+ expect(payload.releases).toHaveLength(2);
+ expect(payload.version).toBe('1.0.0');
+ expect(payload.download_url).toBe('https://example.test/example.zip');
+ });
+
+ it('requires an initial release when nothing has ever been published', () => {
+ const form = extensionForm({ version_tag: '' });
+ form.delete('release_date');
+ form.delete('download_url');
+ form.delete('min_fossbilling_version');
+
+ expect(() => buildExtensionUpdatePayload(form, null)).toThrow(
+ ExtensionValidationError,
+ );
+ });
+
+ it('rejects a version_tag that duplicates an existing release instead of appending a second copy', () => {
+ const form = extensionForm({ version_tag: '0.9.0' });
+
+ expect(() => buildExtensionUpdatePayload(form, publishedExtension)).toThrow(
+ ExtensionValidationError,
+ );
+ });
+
+ it('rejects a new release once the extension already has 100', () => {
+ const atLimit: Extension = {
+ ...publishedExtension,
+ releases: Array.from({ length: 100 }, (_, i) => ({
+ tag: `0.${i}.0`,
+ date: '2025-01-01',
+ download_url: `https://example.test/example-0.${i}.0.zip`,
+ min_fossbilling_version: '0.5.0',
+ })),
+ };
+
+ expect(() => buildExtensionUpdatePayload(extensionForm(), atLimit)).toThrow(
+ ExtensionValidationError,
+ );
+ });
+});
diff --git a/test/extensions-api.test.ts b/test/extensions-api.test.ts
index 911a641..9344309 100644
--- a/test/extensions-api.test.ts
+++ b/test/extensions-api.test.ts
@@ -20,11 +20,13 @@ import {
getExtensionById,
listExtensions,
type Extension,
+ type ExtensionCreate,
type ExtensionListItem,
type ExtensionListResponse,
- type SubmissionQueuePage,
- type SubmissionPayload,
- type SubmissionPage,
+ type ExtensionRevision,
+ type ModerationQueuePage,
+ type OwnedExtensionListResponse,
+ type RevisionHistoryPage,
} from '@/lib/api/client';
import { mintBearerAssertion } from '@/lib/assertion';
import { isCatalogueCardPage } from '@/scripts/extension-catalogue';
@@ -95,14 +97,18 @@ function page(
return { result, pagination: { next_cursor, has_more } };
}
-function submissionPage(
+function ownedExtensionsPage(
next_cursor: string | null,
has_more: boolean,
-): SubmissionPage {
- return {
- result: [],
- pagination: { next_cursor, has_more },
- };
+): OwnedExtensionListResponse {
+ return { result: [], pagination: { next_cursor, has_more } };
+}
+
+function moderationPage(
+ next_cursor: string | null,
+ has_more: boolean,
+): ModerationQueuePage {
+ return { result: [], pagination: { next_cursor, has_more } };
}
function requestFrom(fetchMock: ReturnType, index = 0): Request {
@@ -205,10 +211,10 @@ describe('generated Extensions v2 façade', () => {
it('keeps authenticated binding and HTTP transports request-compatible', async () => {
const bindingFetch = vi
.fn()
- .mockResolvedValue(apiResponse(submissionPage(null, false)));
+ .mockResolvedValue(apiResponse(ownedExtensionsPage(null, false)));
const httpFetch = vi
.fn()
- .mockResolvedValue(apiResponse(submissionPage(null, false)));
+ .mockResolvedValue(apiResponse(ownedExtensionsPage(null, false)));
const options = { limit: 25, cursor: 'opaque-cursor' };
await createApiClient(
@@ -220,7 +226,7 @@ describe('generated Extensions v2 façade', () => {
},
},
'user-id',
- ).listMySubmissions(options);
+ ).listMyExtensions(options);
await createApiClient(
{
...authenticatedEnv,
@@ -230,7 +236,7 @@ describe('generated Extensions v2 façade', () => {
},
},
'user-id',
- ).listMySubmissions(options);
+ ).listMyExtensions(options);
const bindingRequest = requestFrom(bindingFetch);
const httpRequest = requestFrom(httpFetch);
@@ -340,7 +346,7 @@ describe('generated Extensions v2 façade', () => {
const fetchMock = vi
.fn()
.mockImplementation(() =>
- Promise.resolve(apiResponse(submissionPage(null, false))),
+ Promise.resolve(apiResponse(ownedExtensionsPage(null, false))),
);
vi.stubGlobal('fetch', fetchMock);
vi.mocked(mintBearerAssertion)
@@ -348,8 +354,8 @@ describe('generated Extensions v2 façade', () => {
.mockResolvedValueOnce('token-two');
const api = createApiClient(authenticatedEnv, 'user-sub');
- await api.listMySubmissions({ limit: 100, cursor: 'opaque cursor' });
- await api.listMySubmissions({ limit: 100 });
+ await api.listMyExtensions({ limit: 100, cursor: 'opaque cursor' });
+ await api.listMyExtensions({ limit: 100 });
expect(mintBearerAssertion).toHaveBeenCalledTimes(2);
expect(mintBearerAssertion).toHaveBeenNthCalledWith(
@@ -364,7 +370,7 @@ describe('generated Extensions v2 façade', () => {
'Bearer token-two',
);
expect(requestUrl(fetchMock, 0).pathname).toBe(
- '/extensions/v2/submissions/mine',
+ '/extensions/v2/extensions/mine',
);
expect(requestUrl(fetchMock, 0).searchParams.get('limit')).toBe('100');
expect(requestUrl(fetchMock, 0).searchParams.get('cursor')).toBe(
@@ -393,54 +399,184 @@ describe('generated Extensions v2 façade', () => {
expect(url.searchParams.has('developer_id')).toBe(false);
});
- it('serializes generated request bodies as well as paths and queries', async () => {
+ it('serializes a create payload with no developer field and reports the new revision', async () => {
const payload = {
- developer: {
- id: 'fossbilling',
- type: 'organization' as const,
- name: 'FOSSBilling',
- },
- extension: {
- id: 'body-extension',
- type: 'mod' as const,
- name: 'Body extension',
- description: 'Submitted through the generated client.',
- releases: [],
- website: 'https://example.test/body-extension',
- license: { name: 'MIT' },
- readme: '# Body extension',
- source: { type: 'github' as const, repo: 'fossbilling/body-extension' },
- version: '1.0.0',
- download_url: 'https://example.test/body-extension.zip',
- },
- } satisfies SubmissionPayload;
- const fetchMock = vi
- .fn()
- .mockResolvedValue(
- apiResponse({ result: { id: 'submission-1', status: 'pending' } }, 201),
- );
+ id: 'body-extension',
+ type: 'mod' as const,
+ name: 'Body extension',
+ description: 'Submitted through the generated client.',
+ releases: [],
+ website: 'https://example.test/body-extension',
+ license: { name: 'MIT' },
+ readme: '# Body extension',
+ source: { type: 'github' as const, repo: 'fossbilling/body-extension' },
+ version: '1.0.0',
+ download_url: 'https://example.test/body-extension.zip',
+ } satisfies ExtensionCreate;
+ const fetchMock = vi.fn().mockResolvedValue(
+ apiResponse(
+ {
+ result: {
+ id: 'body-extension',
+ revision_id: 'revision-1',
+ status: 'pending',
+ },
+ },
+ 201,
+ ),
+ );
vi.stubGlobal('fetch', fetchMock);
- await createApiClient(authenticatedEnv, 'user-sub').submitExtension(
- payload,
- );
+ const result = await createApiClient(
+ authenticatedEnv,
+ 'user-sub',
+ ).createExtension(payload);
const request = requestFrom(fetchMock);
- expect(new URL(request.url).pathname).toBe('/extensions/v2/submissions');
+ expect(new URL(request.url).pathname).toBe('/extensions/v2/extensions');
+ expect(request.method).toBe('POST');
expect(request.headers.get('content-type')).toBe('application/json');
expect(await request.json()).toEqual(payload);
+ expect(result).toEqual({
+ id: 'body-extension',
+ revision_id: 'revision-1',
+ status: 'pending',
+ });
+ });
+
+ it('sends an edit as PUT and reads the 202 pending-revision result', async () => {
+ const payload = {
+ type: 'mod' as const,
+ name: 'Body extension',
+ description: 'Edited through the generated client.',
+ releases: [],
+ website: 'https://example.test/body-extension',
+ license: { name: 'MIT' },
+ readme: '# Body extension',
+ source: { type: 'github' as const, repo: 'fossbilling/body-extension' },
+ version: '1.1.0',
+ download_url: 'https://example.test/body-extension-1.1.0.zip',
+ };
+ const fetchMock = vi.fn().mockResolvedValue(
+ apiResponse(
+ {
+ result: {
+ id: 'body-extension',
+ revision_id: 'revision-2',
+ status: 'pending',
+ },
+ },
+ 202,
+ ),
+ );
+ vi.stubGlobal('fetch', fetchMock);
+
+ const result = await createApiClient(
+ authenticatedEnv,
+ 'user-sub',
+ ).updateExtension('body-extension', payload);
+
+ const request = requestFrom(fetchMock);
+ expect(new URL(request.url).pathname).toBe(
+ '/extensions/v2/extensions/body-extension',
+ );
+ expect(request.method).toBe('PUT');
+ expect(await request.json()).toEqual(payload);
+ expect(result.revision_id).toBe('revision-2');
});
- it('returns submission pagination and preserves moderation filters', async () => {
+ it('withdraws an unpublished extension with DELETE', async () => {
+ const fetchMock = vi.fn().mockResolvedValue(
+ apiResponse({
+ result: { id: 'body-extension', deleted: true },
+ }),
+ );
+ vi.stubGlobal('fetch', fetchMock);
+
+ const result = await createApiClient(
+ authenticatedEnv,
+ 'user-sub',
+ ).withdrawExtension('body-extension');
+
+ const request = requestFrom(fetchMock);
+ expect(new URL(request.url).pathname).toBe(
+ '/extensions/v2/extensions/body-extension',
+ );
+ expect(request.method).toBe('DELETE');
+ expect(result).toEqual({ id: 'body-extension', deleted: true });
+ });
+
+ it('lists an extension revision history by id, oldest params preserved', async () => {
+ const historyPage: RevisionHistoryPage = {
+ result: [],
+ pagination: { next_cursor: 'history-2', has_more: true },
+ };
+ const fetchMock = vi.fn().mockResolvedValue(apiResponse(historyPage));
+ vi.stubGlobal('fetch', fetchMock);
+
+ const response = await createApiClient(
+ authenticatedEnv,
+ 'user-sub',
+ ).listExtensionRevisions('body-extension', {
+ limit: 25,
+ cursor: 'history-cursor',
+ });
+
+ const url = requestUrl(fetchMock);
+ expect(url.pathname).toBe(
+ '/extensions/v2/extensions/body-extension/revisions',
+ );
+ expect(url.searchParams.get('limit')).toBe('25');
+ expect(url.searchParams.get('cursor')).toBe('history-cursor');
+ expect(response.pagination).toEqual(historyPage.pagination);
+ });
+
+ it('approves and rejects a revision by extension id + revision id', async () => {
+ const approveFetch = vi
+ .fn()
+ .mockResolvedValue(
+ apiResponse({ result: { id: 'r-1', status: 'approved' } }),
+ );
+ vi.stubGlobal('fetch', approveFetch);
+ await createApiClient(authenticatedEnv, 'moderator-sub').approveRevision(
+ 'body-extension',
+ 'r-1',
+ 'looks good',
+ );
+ const approveRequest = requestFrom(approveFetch);
+ expect(new URL(approveRequest.url).pathname).toBe(
+ '/extensions/v2/extensions/body-extension/revisions/r-1/approve',
+ );
+ expect(await approveRequest.json()).toEqual({ review_note: 'looks good' });
+
+ const rejectFetch = vi
+ .fn()
+ .mockResolvedValue(
+ apiResponse({ result: { id: 'r-2', status: 'rejected' } }),
+ );
+ vi.stubGlobal('fetch', rejectFetch);
+ await createApiClient(authenticatedEnv, 'moderator-sub').rejectRevision(
+ 'body-extension',
+ 'r-2',
+ 'needs work',
+ );
+ const rejectRequest = requestFrom(rejectFetch);
+ expect(new URL(rejectRequest.url).pathname).toBe(
+ '/extensions/v2/extensions/body-extension/revisions/r-2/reject',
+ );
+ expect(await rejectRequest.json()).toEqual({ review_note: 'needs work' });
+ });
+
+ it('returns moderation queue pagination and preserves status/cursor filters', async () => {
const fetchMock = vi
.fn()
- .mockResolvedValue(apiResponse(submissionPage('next-page', true)));
+ .mockResolvedValue(apiResponse(moderationPage('next-page', true)));
vi.stubGlobal('fetch', fetchMock);
const response = await createApiClient(
authenticatedEnv,
'moderator-sub',
- ).listQueue('approved', { limit: 100, cursor: 'queue-cursor' });
+ ).listModerationQueue('approved', { limit: 100, cursor: 'queue-cursor' });
expect(response.pagination).toEqual({
next_cursor: 'next-page',
@@ -521,14 +657,29 @@ describe('generated Extensions v2 façade', () => {
>().toEqualTypeOf();
});
+ it('keeps every revision content field optional, unlike published Extension content', () => {
+ expectTypeOf<
+ undefined extends ExtensionRevision['content']['name'] ? true : false
+ >().toEqualTypeOf();
+ expectTypeOf<
+ undefined extends ExtensionRevision['content']['readme'] ? true : false
+ >().toEqualTypeOf();
+ expectTypeOf<
+ undefined extends Extension['name'] ? true : false
+ >().toEqualTypeOf();
+ expectTypeOf<
+ undefined extends Extension['readme'] ? true : false
+ >().toEqualTypeOf();
+ });
+
it('keeps façade pagination and payload types tied to generated responses', () => {
- expectTypeOf().toEqualTypeOf<{
+ expectTypeOf().toEqualTypeOf<{
next_cursor: string | null;
has_more: boolean;
}>();
expectTypeOf<
- ReturnType['listQueue']>
- >().resolves.toEqualTypeOf();
+ ReturnType['listModerationQueue']>
+ >().resolves.toEqualTypeOf();
});
});
diff --git a/test/extensions-data.test.ts b/test/extensions-data.test.ts
index 8ed4606..6441f8f 100644
--- a/test/extensions-data.test.ts
+++ b/test/extensions-data.test.ts
@@ -3,20 +3,18 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
const mocks = vi.hoisted(() => ({
createApiClient: vi.fn(),
getDeveloperById: vi.fn(),
- getExtensionById: vi.fn(),
}));
vi.mock('@/lib/api/client', () => ({
createApiClient: mocks.createApiClient,
getDeveloperById: mocks.getDeveloperById,
- getExtensionById: mocks.getExtensionById,
}));
import {
getDeveloperById,
getDeveloperByOwner,
- getExtensionForSubmission,
getExtensionsByOwner,
+ getOwnedExtension,
} from '@/lib/extensions-data';
import type { ApplicationEnv } from '@/lib/runtime';
@@ -31,19 +29,77 @@ const env: ApplicationEnv = {
assertionSigningSecret: 'assertion-secret',
};
+const developer = {
+ id: 'developer',
+ type: 'organization' as const,
+ name: 'Example developer',
+ approved: true,
+ unclaimed: false,
+};
+
beforeEach(() => {
mocks.createApiClient.mockReset();
mocks.getDeveloperById.mockReset();
- mocks.getExtensionById.mockReset();
});
describe('API-backed extension data adapters', () => {
- it('treats a failed detail read as a missing submission resource', async () => {
- mocks.getExtensionById.mockRejectedValue(new Error('API unavailable'));
+ it('treats a failed or unauthorized owner detail read as a missing resource', async () => {
+ mocks.createApiClient.mockReturnValue({
+ getMyExtension: vi.fn().mockRejectedValue(new Error('API unavailable')),
+ });
- await expect(getExtensionForSubmission(env, 'extension-id')).resolves.toBe(
- null,
- );
+ await expect(
+ getOwnedExtension(env, 'user-subject', 'extension-id'),
+ ).resolves.toBe(null);
+ });
+
+ it('splits the owner detail response into published/pendingRevision/lastReview', async () => {
+ mocks.createApiClient.mockReturnValue({
+ getMyExtension: vi.fn().mockResolvedValue({
+ id: 'extension-id',
+ developer,
+ published: {
+ type: 'mod',
+ name: 'Example',
+ description: 'desc',
+ releases: [],
+ website: 'https://example.test',
+ license: { name: 'MIT' },
+ readme: '# Example',
+ source: { type: 'github', repo: 'fossbilling/example' },
+ version: '1.0.0',
+ download_url: 'https://example.test/example.zip',
+ },
+ pending_revision: {
+ id: 'revision-1',
+ created_at: '2026-01-01T00:00:00Z',
+ content: { name: 'Example (edited)' },
+ },
+ last_review: {
+ revision_id: 'revision-0',
+ status: 'approved',
+ review_note: null,
+ reviewed_at: '2025-12-01T00:00:00Z',
+ },
+ created_at: '2025-01-01T00:00:00Z',
+ updated_at: '2026-01-01T00:00:00Z',
+ }),
+ });
+
+ const detail = await getOwnedExtension(env, 'user-subject', 'extension-id');
+
+ expect(detail?.published?.name).toBe('Example');
+ expect(detail?.pendingRevision).toEqual({
+ id: 'revision-1',
+ createdAt: '2026-01-01T00:00:00Z',
+ content: { name: 'Example (edited)' },
+ });
+ expect(detail?.lastReview).toEqual({
+ revisionId: 'revision-0',
+ status: 'approved',
+ reviewNote: null,
+ reviewedAt: '2025-12-01T00:00:00Z',
+ });
});
it('treats failed public developer reads as missing profiles', async () => {
diff --git a/test/submission-form.test.ts b/test/submission-form.test.ts
deleted file mode 100644
index 686ba96..0000000
--- a/test/submission-form.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { buildSubmissionPayload } from '@/lib/submission-form';
-import type { DeveloperProfile } from '@/types';
-
-function submissionForm(): FormData {
- const form = new FormData();
- form.set('extension_id', 'example');
- form.set('type', 'mod');
- form.set('name', 'Example');
- form.set('description', 'An example extension.');
- form.set('website', 'example.test');
- form.set('license_name', 'MIT');
- form.set('license_url', 'https://example.test/license');
- form.set('readme', '# Example');
- form.set('source_type', 'github');
- form.set('source_repo', 'fossbilling/example');
- form.set('version_tag', '1.0.0');
- form.set('release_date', '2026-01-01');
- form.set('download_url', 'https://example.test/example.zip');
- form.set('min_fossbilling_version', '0.6.0');
- return form;
-}
-
-describe('extension submission payloads', () => {
- it('projects the local developer profile to the v2 submission shape', () => {
- const developer: DeveloperProfile = {
- id: 'developer',
- type: 'organization',
- name: 'Example developer',
- URL: 'https://example.test',
- approved: true,
- contact_email: 'developer@example.test',
- content_revision: 1,
- };
-
- const payload = buildSubmissionPayload(submissionForm(), developer);
-
- expect(payload.developer).toEqual({
- id: 'developer',
- type: 'organization',
- name: 'Example developer',
- URL: 'https://example.test',
- });
- expect(payload.developer).not.toHaveProperty('approved');
- expect(payload.developer).not.toHaveProperty('contact_email');
- });
-});