mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-28 07:41:23 +00:00
fix: QA hardening across desktop connect, CLI, setup, and PWA update flow (#52)
CI / Backend Tests (push) Canceled after 0s
CI / Frontend Tests (push) Canceled after 0s
CI / Build All Services (push) Canceled after 0s
CI / Docker Build (auth) (push) Canceled after 0s
CI / Docker Build (backend) (push) Canceled after 0s
CI / Docker Build (frontend) (push) Canceled after 0s
CI / Publish edge images (auth) (push) Canceled after 0s
CI / Publish edge images (backend) (push) Canceled after 0s
CI / Publish edge images (frontend) (push) Canceled after 0s
CI / Migration Up/Down (push) Canceled after 0s
CI / Compose E2E Smoke (push) Canceled after 0s
CI / Lint (push) Canceled after 0s
CI / Backend Tests (push) Canceled after 0s
CI / Frontend Tests (push) Canceled after 0s
CI / Build All Services (push) Canceled after 0s
CI / Docker Build (auth) (push) Canceled after 0s
CI / Docker Build (backend) (push) Canceled after 0s
CI / Docker Build (frontend) (push) Canceled after 0s
CI / Publish edge images (auth) (push) Canceled after 0s
CI / Publish edge images (backend) (push) Canceled after 0s
CI / Publish edge images (frontend) (push) Canceled after 0s
CI / Migration Up/Down (push) Canceled after 0s
CI / Compose E2E Smoke (push) Canceled after 0s
CI / Lint (push) Canceled after 0s
- desktop: probe-then-persist server URL — scheme-less input tries https then http; a failed probe no longer saves a dead URL that would trap the next launch in a redirect to a broken address - frontend: close the create-collection modal on successful submit (backdrop stayed mounted and intercepted navigation) - frontend: reload once on service-worker controllerchange so returning users don't run a stale cached shell after a deploy - frontend: gate dashboard empty states on resource loading to stop the "No project selected" / "Create your workspace" flash - cli: resolve scheduled-job refs by name or id for jobs:run, jobs:runs, and jobs:rm, matching bucket/org resolution - cli: correct stale pk_live_/pk_test_ help text to the real prm_ format; align README command spellings and demo seed prefixes - setup: rewrite all public URL vars (auth, vite, backend) and cookie domain for the entered host — https for domains, http for IPs — with anchored full-line substitutions so stale ports/paths can't survive - docs: VITE_* vars never reach the frontend image build; the app resolves API/auth URLs same-origin at runtime, so host changes need no rebuild — noted HTTPS requirement for PWA/secure-context features Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
56c63d43cd
commit
d44bbcceda
12 files changed
+138
-33
No files matched your search
+7
-3
@@ -40,7 +40,7 @@ docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d
|
||||
| `PRIMORA_ENCRYPTION_KEY` | AES-256 key (64 hex chars) for project secrets (Vault page, `secret://` job refs), integration credentials + webhook secrets at rest | production |
|
||||
| `AUTH_BASE_URL` / `BETTER_AUTH_URL` | public auth URL (`https://host/auth`) | yes |
|
||||
| `AUTH_INTERNAL_BASE_URL` | backend → auth internal URL (`http://auth:3001`) | yes |
|
||||
| `VITE_APP_URL` / `VITE_AUTH_BASE_URL` / `VITE_API_BASE_URL` | frontend public URLs — **baked into the frontend image at build time** | yes |
|
||||
| `VITE_APP_URL` / `VITE_AUTH_BASE_URL` / `VITE_API_BASE_URL` | frontend public URLs — informational only; the shipped image resolves API/auth URLs same-origin at runtime, so no rebuild is needed when the host changes | yes |
|
||||
| `BACKEND_STORAGE_ROOT` | object storage directory inside the backend container (local driver) | yes |
|
||||
| `BACKEND_STORAGE_DRIVER` | `local` (default) or `s3` — S3-compatible object storage | no |
|
||||
| `S3_ENDPOINT` / `S3_REGION` / `S3_BUCKET` | S3 API endpoint (empty endpoint → AWS `s3.<region>.amazonaws.com`), region, bucket | with `s3` |
|
||||
@@ -81,8 +81,12 @@ labels:
|
||||
```
|
||||
|
||||
Once TLS is live, update `VITE_APP_URL`, `VITE_AUTH_BASE_URL`,
|
||||
`AUTH_BASE_URL`, `BETTER_AUTH_URL`, and `COOKIE_DOMAIN` to the https origin
|
||||
and rebuild the frontend image (`docker compose build frontend`).
|
||||
`AUTH_BASE_URL`, `BETTER_AUTH_URL`, `BACKEND_PUBLIC_URL`, and
|
||||
`COOKIE_DOMAIN` to the https origin and restart the stack
|
||||
(`docker compose up -d`). The frontend resolves API/auth URLs
|
||||
same-origin, so no image rebuild is needed — HTTPS is still required for
|
||||
PWA install, service workers, and other secure-context features on
|
||||
non-localhost origins.
|
||||
|
||||
## SMTP / email
|
||||
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ project interactively.
|
||||
## Commands
|
||||
|
||||
`orgs`, `projects`, `buckets`, `objects` (list/upload/download/rm), `keys`,
|
||||
`jobs`, `events:send`, `audit list --follow`. Every command accepts `--json`.
|
||||
`jobs`, `events:send`, `audit:list --follow`. Every command accepts `--json`.
|
||||
|
||||
```sh
|
||||
primora events:send custom.deploy.done --data '{"sha":"abc123"}'
|
||||
@@ -31,7 +31,7 @@ primora events:send custom.deploy.done --data '{"sha":"abc123"}'
|
||||
webhooks, and `event_pattern` functions all fire.
|
||||
|
||||
```sh
|
||||
primora documents list --collection users \
|
||||
primora documents:list --collection users \
|
||||
--filter "status.eq.active,age.gt.18" --order "age.desc"
|
||||
```
|
||||
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ cli
|
||||
.option("--url <url>", "Primora base URL (default http://localhost)")
|
||||
.option("--email <email>", "Account email")
|
||||
.option("--password <password>", "Account password")
|
||||
.option("--api-key <key>", "Store a pk_live_/pk_test_ API key instead of a session")
|
||||
.option("--api-key <key>", "Store a prm_ API key instead of a session")
|
||||
.option("--json", "Machine-readable output")
|
||||
.action(cmdLogin);
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { ScheduledJob, ScheduledJobRun } from "@primora/api-client";
|
||||
import { AutomationService } from "@primora/api-client";
|
||||
|
||||
import { loadConfig } from "../config.js";
|
||||
import { configureClient, requireAuth, requireProject } from "../http.js";
|
||||
import { configureClient, requireAuth, requireProject, resolveJobId } from "../http.js";
|
||||
import { formatDate, isJson, printJson, printTable, success } from "../out.js";
|
||||
|
||||
interface JobOptions {
|
||||
@@ -88,12 +88,13 @@ export async function cmdJobsCreate(
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdJobsRemove(jobId: string, options: JobOptions & { yes?: boolean }): Promise<void> {
|
||||
export async function cmdJobsRemove(jobRef: string, options: JobOptions & { yes?: boolean }): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
requireAuth(cfg);
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
await AutomationService.deleteScheduledJob({ projectId, jobId });
|
||||
if (isJson(options)) {
|
||||
printJson({ deleted: jobId });
|
||||
@@ -102,12 +103,13 @@ export async function cmdJobsRemove(jobId: string, options: JobOptions & { yes?:
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdJobsRun(jobId: string, options: JobOptions): Promise<void> {
|
||||
export async function cmdJobsRun(jobRef: string, options: JobOptions): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
requireAuth(cfg);
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
const run = await AutomationService.runScheduledJob({ projectId, jobId });
|
||||
if (isJson(options)) {
|
||||
printJson(run);
|
||||
@@ -128,7 +130,7 @@ function runRow(run: ScheduledJobRun): string[] {
|
||||
}
|
||||
|
||||
export async function cmdJobsRuns(
|
||||
jobId: string,
|
||||
jobRef: string,
|
||||
options: JobOptions & { limit?: string },
|
||||
): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
@@ -136,6 +138,7 @@ export async function cmdJobsRuns(
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
const page = await AutomationService.listScheduledJobRuns({
|
||||
projectId,
|
||||
jobId,
|
||||
|
||||
+14
-1
@@ -1,4 +1,4 @@
|
||||
import { OpenAPI, StorageService } from "@primora/api-client";
|
||||
import { AutomationService, OpenAPI, StorageService } from "@primora/api-client";
|
||||
|
||||
import type { CliConfig } from "./config.js";
|
||||
|
||||
@@ -110,3 +110,16 @@ export async function resolveBucketId(projectId: string, ref: string): Promise<s
|
||||
}
|
||||
return match.id;
|
||||
}
|
||||
|
||||
/** Resolve a scheduled job reference that may be an id or a name. */
|
||||
export async function resolveJobId(projectId: string, ref: string): Promise<string> {
|
||||
const { items } = await AutomationService.listScheduledJobs({ projectId });
|
||||
const match = items.find((j) => j.id === ref || j.name === ref);
|
||||
if (!match) {
|
||||
throw new CliError(
|
||||
`Job "${ref}" not found.`,
|
||||
`Known jobs: ${items.map((j) => j.name).join(", ") || "(none)"}`,
|
||||
);
|
||||
}
|
||||
return match.id;
|
||||
}
|
||||
+23
-11
@@ -101,6 +101,18 @@
|
||||
tauri?.event.emit("open-vault");
|
||||
});
|
||||
|
||||
const probe = async (url) => {
|
||||
try {
|
||||
// Opaque (no-cors) — proves the host answers, not that it is a
|
||||
// Primora deployment. A wrong-but-alive URL is recoverable via the
|
||||
// tray menu's "Change server".
|
||||
await fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(8000) });
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
form.addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
err.hidden = true;
|
||||
@@ -108,7 +120,17 @@
|
||||
button.textContent = "Checking…";
|
||||
|
||||
let url = input.value.trim();
|
||||
if (!/^https?:\/\//i.test(url)) url = `https://${url}`;
|
||||
if (!/^https?:\/\//i.test(url)) {
|
||||
// Self-hosted deployments are often plain HTTP on a LAN — probe
|
||||
// https first, fall back to http, and only keep the one that answers.
|
||||
const https = `https://${url}`;
|
||||
url = (await probe(https)) ? https : `http://${url}`;
|
||||
}
|
||||
|
||||
if (!(await probe(url))) {
|
||||
fail("Server did not respond. Check the URL and that the deployment is up.");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await tauri.core.invoke("set_server_url", { url });
|
||||
@@ -117,16 +139,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Reachability probe — opaque (no-cors), so it proves the host answers,
|
||||
// not that it is a Primora deployment. A wrong-but-alive URL is recoverable
|
||||
// via the tray menu's "Change server".
|
||||
try {
|
||||
await fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(8000) });
|
||||
} catch {
|
||||
fail("Server did not respond. Check the URL and that the deployment is up.");
|
||||
return;
|
||||
}
|
||||
|
||||
location.replace(url);
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -1637,7 +1637,7 @@ export default function App() {
|
||||
<PwaInstallBanner />
|
||||
|
||||
<Show
|
||||
when={platform() || isDemo}
|
||||
when={platform()}
|
||||
fallback={
|
||||
<div class="page">
|
||||
<div class="skeleton" style="height:2rem;width:12rem;border-radius:8px" />
|
||||
@@ -1656,6 +1656,14 @@ export default function App() {
|
||||
when={activeProject()}
|
||||
fallback={
|
||||
<div class="page">
|
||||
<Show
|
||||
when={!organizationProjects.loading}
|
||||
fallback={
|
||||
<div class="card" style="min-height:20rem">
|
||||
<div class="skeleton" style="height:100%;min-height:20rem;border-radius:12px" />
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<Show
|
||||
when={(platform()?.organizations ?? []).length > 0}
|
||||
fallback={
|
||||
@@ -1702,6 +1710,7 @@ export default function App() {
|
||||
</button>
|
||||
</div>
|
||||
</Show>
|
||||
</Show>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { render } from 'solid-js/web';
|
||||
import { createSignal } from 'solid-js';
|
||||
import { applySlugField } from '../slug';
|
||||
import { Input } from '../../components/Input';
|
||||
|
||||
describe('slug auto-derive in DOM', () => {
|
||||
it('typing name fills the slug input', async () => {
|
||||
const host = document.createElement('div');
|
||||
document.body.appendChild(host);
|
||||
const [input, setInput] = createSignal({ name: '', slug: '' });
|
||||
const dispose = render(() => (
|
||||
<form>
|
||||
<Input label="Name" value={input().name}
|
||||
onInput={(e) => setInput((c) => applySlugField(c, 'name', e.currentTarget.value))} />
|
||||
<Input label="Slug" value={input().slug}
|
||||
onInput={(e) => setInput((c) => applySlugField(c, 'slug', e.currentTarget.value))} />
|
||||
</form>
|
||||
), host);
|
||||
const [name, slug] = Array.from(host.querySelectorAll('input'));
|
||||
name.value = 'Acme Corp';
|
||||
name.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
expect(slug.value).toBe('acme-corp');
|
||||
dispose();
|
||||
host.remove();
|
||||
});
|
||||
});
|
||||
@@ -216,7 +216,7 @@ let apiKeys: ApiKey[] = [
|
||||
id: "key-1",
|
||||
project_id: "proj-1",
|
||||
name: "Production key",
|
||||
prefix: "pk_live_7f2a",
|
||||
prefix: "prm_7f2a9c",
|
||||
last_used_at: ago(0.2),
|
||||
revoked_at: null,
|
||||
},
|
||||
@@ -224,7 +224,7 @@ let apiKeys: ApiKey[] = [
|
||||
id: "key-2",
|
||||
project_id: "proj-1",
|
||||
name: "CI deploy",
|
||||
prefix: "pk_test_9c41",
|
||||
prefix: "prm_9c41de",
|
||||
last_used_at: ago(2),
|
||||
revoked_at: null,
|
||||
},
|
||||
|
||||
@@ -3,4 +3,17 @@ import { render } from "solid-js/web";
|
||||
import App from "./App";
|
||||
import "./index.css";
|
||||
|
||||
// Reload once when an updated service worker takes control. Without this the
|
||||
// precached shell keeps serving the previous release until a manual refresh.
|
||||
// Skipped when the page has no controller yet (first SW install) so first-time
|
||||
// visitors don't get an extra reload.
|
||||
if ("serviceWorker" in navigator && navigator.serviceWorker.controller) {
|
||||
let refreshing = false;
|
||||
navigator.serviceWorker.addEventListener("controllerchange", () => {
|
||||
if (refreshing) return;
|
||||
refreshing = true;
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
|
||||
render(() => <App />, document.getElementById("root")!);
|
||||
@@ -253,7 +253,13 @@ export function CollectionsPage(props: CollectionsPageProps) {
|
||||
title="Create collection"
|
||||
description="Collections store JSON documents scoped to a project."
|
||||
>
|
||||
<form onSubmit={props.onCreateCollection} class="space-y-4">
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
props.onCreateCollection(e);
|
||||
setCreateOpen(false);
|
||||
}}
|
||||
class="space-y-4"
|
||||
>
|
||||
<Input
|
||||
label="Collection name"
|
||||
placeholder="Posts"
|
||||
|
||||
+24
-7
@@ -48,15 +48,32 @@ fi
|
||||
read -p "🌐 Enter your domain or IP (default: localhost): " DOMAIN
|
||||
DOMAIN=${DOMAIN:-localhost}
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
sed -i '' "s/COOKIE_DOMAIN=localhost/COOKIE_DOMAIN=$DOMAIN/g" .env
|
||||
sed -i '' "s/BETTER_AUTH_URL=http:\/\/localhost/BETTER_AUTH_URL=http:\/\/$DOMAIN/g" .env
|
||||
sed -i '' "s/VITE_APP_URL=http:\/\/localhost/VITE_APP_URL=http:\/\/$DOMAIN/g" .env
|
||||
# Plain HTTP for localhost/IPs; domains are presumed to sit behind a TLS
|
||||
# proxy (see DEPLOYMENT_GUIDE.md — Primora never terminates TLS itself).
|
||||
if [[ "$DOMAIN" == "localhost" || "$DOMAIN" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
SCHEME="http"
|
||||
else
|
||||
sed -i "s/COOKIE_DOMAIN=localhost/COOKIE_DOMAIN=$DOMAIN/g" .env
|
||||
sed -i "s/BETTER_AUTH_URL=http:\/\/localhost/BETTER_AUTH_URL=http:\/\/$DOMAIN/g" .env
|
||||
sed -i "s/VITE_APP_URL=http:\/\/localhost/VITE_APP_URL=http:\/\/$DOMAIN/g" .env
|
||||
SCHEME="https"
|
||||
fi
|
||||
BASE_URL="$SCHEME://$DOMAIN"
|
||||
|
||||
rewrite_env() {
|
||||
# $1 = var name, $2 = new value — anchor to the full line so prior values
|
||||
# (ports, stale paths) are replaced regardless of what .env.example held.
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
sed -i '' "s|^$1=.*|$1=$2|" .env
|
||||
else
|
||||
sed -i "s|^$1=.*|$1=$2|" .env
|
||||
fi
|
||||
}
|
||||
|
||||
rewrite_env AUTH_BASE_URL "$BASE_URL/auth"
|
||||
rewrite_env BETTER_AUTH_URL "$BASE_URL/auth"
|
||||
rewrite_env VITE_APP_URL "$BASE_URL"
|
||||
rewrite_env VITE_AUTH_BASE_URL "$BASE_URL/auth"
|
||||
rewrite_env VITE_API_BASE_URL "$BASE_URL/api/v1"
|
||||
rewrite_env BACKEND_PUBLIC_URL "$BASE_URL/api/v1"
|
||||
rewrite_env COOKIE_DOMAIN "$DOMAIN"
|
||||
|
||||
# Start services — the dev overlay adds mailpit for local email capture.
|
||||
# Production deploys use the base file alone: docker compose up -d
|
||||
|
||||
Reference in new issue
Block a user