From bbf3bfc48a41ca47bd57e0e33da31dc447172f41 Mon Sep 17 00:00:00 2001 From: ZTatman Date: Wed, 15 Apr 2026 22:09:02 -0400 Subject: [PATCH] refactor(cli): user proper api endpoints to get forgejo username and total repo count when verifying --- README.md | 4 +- .../cli/examples/docker-compose.example.yml | 4 +- packages/cli/src/utils/forgejo-checks.ts | 47 ++++++++++--------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 2699462..234bc4b 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ Myst should not assume a VPS-only environment. The requirement is an existing Fo Create a `.env` file with: ```env -FORGEJO_BASE_URL="https://git.example.com" -FORGEJO_PAT="forgejo_pat_xxxxxxxxxxxx" +FORGEJO_BASE_URL=https://git.example.com +FORGEJO_PAT=forgejo_pat_xxxxxxxxxxxx ``` When using the provided Docker Compose example, DATABASE_URL is injected automatically. For other deployment approaches (e.g., bare metal, Kubernetes), you must supply DATABASE_URL yourself. diff --git a/packages/cli/examples/docker-compose.example.yml b/packages/cli/examples/docker-compose.example.yml index 7ee8aa6..d63a52f 100644 --- a/packages/cli/examples/docker-compose.example.yml +++ b/packages/cli/examples/docker-compose.example.yml @@ -1,7 +1,7 @@ # Docker Compose example for deploying Myst with PostgreSQL # # Usage: -# 1. Copy to docker-compose.yml: cp examples/docker-compose.example.yml docker-compose.yml +# 1. Copy to docker-compose.yml: cp packages/cli/examples/docker-compose.example.yml docker-compose.yml # 2. Edit .env with your Forgejo config # 3. Run: docker compose up -d # @@ -39,4 +39,4 @@ services: retries: 5 volumes: - myst-postgres: \ No newline at end of file + myst-postgres: diff --git a/packages/cli/src/utils/forgejo-checks.ts b/packages/cli/src/utils/forgejo-checks.ts index 35a70b7..d862758 100644 --- a/packages/cli/src/utils/forgejo-checks.ts +++ b/packages/cli/src/utils/forgejo-checks.ts @@ -71,36 +71,41 @@ export async function checkRepoAccess( pat: string, ): Promise { try { - const response = await fetchWithTimeout(`${baseUrl}/api/v1/user/repos`, { - method: "GET", - headers: { - Authorization: `token ${pat}`, - }, - }); + const responses = await Promise.all([ + fetchWithTimeout(`${baseUrl}/api/v1/user`, { + method: "GET", + headers: { + Authorization: `token ${pat}`, + }, + }), + fetchWithTimeout(`${baseUrl}/api/v1/user/repos`, { + method: "GET", + headers: { + Authorization: `token ${pat}`, + }, + }), + ]); - if (response.status === 401 || response.status === 403) { - const result = (await response.json()) as { message: string }; - return createCheckResult("Forgejo", false, result.message); - } - - if (!response.ok) { - const result = (await response.json()) as { + const errorResponse = responses.find((res) => !res.ok); + if (errorResponse) { + const error = (await errorResponse.json()) as { message: string; url: string; }; - return createCheckResult("Forgejo", false, result.message); + return createCheckResult("Forgejo", false, error.message); } - const repos = (await response.json()) as { - name: string; - owner: { login: string }; - }[]; - if (repos.length > 0) { - const username = repos[0].owner.login; + const [userResponse, reposResponse] = responses; + const user = (await userResponse.json()) as { login: string }; + const totalRepos = parseInt( + reposResponse.headers.get("x-total-count") ?? "0", + ); + + if (user) { return createCheckResult( "Forgejo", true, - `User ${username} has ${repos.length} ${repos.length === 1 ? "repository" : "repositories"}`, + `User ${user.login} has ${totalRepos} ${totalRepos === 1 ? "repository" : "repositories"}`, ); }