fix(context): tolerate a trailing /api/v1 in the base URL

The client (gitea-js) appends /api/v1 to the base URL itself, so a
GITEA_AXI_API_URL that already carries it — a natural guess given the
variable's name — doubled the segment and failed as a spurious
REPO_NOT_FOUND. Normalize the base URL by stripping a trailing /api/v1
(and any trailing slashes) on both the env-URL and tea-login paths, so the
host base and the /api/v1 endpoint both resolve.
This commit is contained in:
2026-07-19 09:41:13 -04:00
parent f9125e099d
commit dd58cd9dad
2 changed files with 63 additions and 3 deletions

View File

@@ -60,6 +60,17 @@ function hostnameOf(url: string, origin: string): string {
} }
} }
/**
* Normalize a Gitea base URL to the host root the client expects. The client
* (gitea-js) appends `/api/v1` itself, so a value that already carries it — a
* natural guess when the variable is literally named `..._API_URL` — would double
* the segment and 404 as a spurious `REPO_NOT_FOUND`. Strip a trailing `/api/v1`
* (with any trailing slashes) so the host base and the API endpoint both work.
*/
function normalizeApiBase(url: string): string {
return url.replace(/\/+$/, "").replace(/\/api\/v1$/, "");
}
function resolveTestModeContext( function resolveTestModeContext(
deps: CliDeps, deps: CliDeps,
apiUrl: string, apiUrl: string,
@@ -72,10 +83,11 @@ function resolveTestModeContext(
["Set `GITEA_AXI_REPO=OWNER/NAME` or pass `-R OWNER/NAME`"], ["Set `GITEA_AXI_REPO=OWNER/NAME` or pass `-R OWNER/NAME`"],
); );
} }
const base = normalizeApiBase(apiUrl);
return { return {
...parseRepoSpec(overrides.repoSpec, overrides.repoOrigin), ...parseRepoSpec(overrides.repoSpec, overrides.repoOrigin),
host: hostnameOf(apiUrl, "`GITEA_AXI_API_URL`"), host: hostnameOf(base, "`GITEA_AXI_API_URL`"),
apiUrl: apiUrl.replace(/\/+$/, ""), apiUrl: base,
token: deps.env.GITEA_AXI_TOKEN ?? "", token: deps.env.GITEA_AXI_TOKEN ?? "",
repoSource: overrides.repoSource, repoSource: overrides.repoSource,
loginSource: overrides.loginSource, loginSource: overrides.loginSource,
@@ -184,7 +196,7 @@ export async function resolveRepoContext(deps: CliDeps): Promise<RepoContext> {
owner, owner,
name, name,
host, host,
apiUrl: login.url.replace(/\/+$/, ""), apiUrl: normalizeApiBase(login.url),
token, token,
repoSource: overrides.repoSource, repoSource: overrides.repoSource,
loginSource: overrides.loginSource, loginSource: overrides.loginSource,

View File

@@ -1,4 +1,6 @@
import { afterEach, describe, expect, it } from "vitest"; import { afterEach, describe, expect, it } from "vitest";
import { resolveRepoContext } from "../src/context.js";
import type { CliDeps } from "../src/deps.js";
import { startFixtureServer, type FixtureServer } from "./fixture-server.js"; import { startFixtureServer, type FixtureServer } from "./fixture-server.js";
import { runCliTest, testModeEnv } from "./harness.js"; import { runCliTest, testModeEnv } from "./harness.js";
@@ -117,3 +119,49 @@ describe("context overrides", () => {
expect(exitCode).toBe(0); expect(exitCode).toBe(0);
}); });
}); });
describe("apiUrl normalization", () => {
function depsWithApiUrl(apiUrl: string): CliDeps {
return {
env: {
GITEA_AXI_API_URL: apiUrl,
GITEA_AXI_REPO: "acme/widgets",
GITEA_AXI_TOKEN: "test-token",
},
cwd: process.cwd(),
globals: {},
};
}
it("strips a trailing /api/v1 suffix from the host base", async () => {
const context = await resolveRepoContext(
depsWithApiUrl("https://git.example.com/api/v1"),
);
expect(context.apiUrl).toBe("https://git.example.com");
});
it("strips a trailing /api/v1/ with a trailing slash", async () => {
const context = await resolveRepoContext(
depsWithApiUrl("https://git.example.com/api/v1/"),
);
expect(context.apiUrl).toBe("https://git.example.com");
});
it("leaves a host base without an /api/v1 suffix unchanged", async () => {
const context = await resolveRepoContext(
depsWithApiUrl("https://git.example.com"),
);
expect(context.apiUrl).toBe("https://git.example.com");
});
it("strips a lone trailing slash from the host base", async () => {
const context = await resolveRepoContext(
depsWithApiUrl("https://git.example.com/"),
);
expect(context.apiUrl).toBe("https://git.example.com");
});
});