mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-28 15:51:23 +00:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20b4ea6a07 | ||
|
|
0511e5754b | ||
|
|
3800e736d0 | ||
|
|
7548ea75d4 | ||
|
|
14d0762245 | ||
|
|
a990989d34 | ||
|
|
3b9ea333ad |
No files matched your search
+5
-1
@@ -77,9 +77,13 @@ BACKEND_STORAGE_DRIVER=local
|
|||||||
|
|
||||||
# Mail defaults — each is overridable in-app (Settings → Instance). In-app
|
# Mail defaults — each is overridable in-app (Settings → Instance). In-app
|
||||||
# values win over these env vars; deleting the in-app value reverts here.
|
# values win over these env vars; deleting the in-app value reverts here.
|
||||||
|
# With no transport configured (no Resend key and no SMTP_HOST) accounts are
|
||||||
|
# verified automatically and no verification mail is attempted.
|
||||||
|
# The dev overlay (docker compose -f docker-compose.yml -f docker-compose.dev.yml)
|
||||||
|
# runs Mailpit — then SMTP_HOST=mailpit catches all outgoing mail at :8025.
|
||||||
RESEND_API_KEY=
|
RESEND_API_KEY=
|
||||||
MAIL_FROM=Primora <[email protected]>
|
MAIL_FROM=Primora <[email protected]>
|
||||||
SMTP_HOST=mailpit
|
SMTP_HOST=
|
||||||
SMTP_PORT=1025
|
SMTP_PORT=1025
|
||||||
SMTP_USER=
|
SMTP_USER=
|
||||||
SMTP_PASSWORD=
|
SMTP_PASSWORD=
|
||||||
|
|||||||
@@ -39,3 +39,5 @@ infra/mailpit
|
|||||||
# Generated code-graph artifacts
|
# Generated code-graph artifacts
|
||||||
graphify-out/
|
graphify-out/
|
||||||
.playwright-mcp/
|
.playwright-mcp/
|
||||||
|
# Local brag/launch-video output
|
||||||
|
brag-output/
|
||||||
@@ -4,6 +4,12 @@ All notable changes to Primora. Format follows [Keep a Changelog](https://keepac
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [0.8.1] - 2026-09-28
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- **SMTP-less instances no longer involve email at all** — when no mail transport is configured (no Resend key, no `SMTP_HOST`), new accounts are created `emailVerified=true`, the verification send is skipped entirely, and existing unverified users are marked verified on startup. `.env.example` no longer defaults `SMTP_HOST` to the dev-only `mailpit` service, which left production deploys pointing at a transport that does not exist.
|
||||||
|
|
||||||
## [0.8.0] - 2026-09-28
|
## [0.8.0] - 2026-09-28
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { requestId } from "hono/request-id";
|
|||||||
import { HTTPException } from "hono/http-exception";
|
import { HTTPException } from "hono/http-exception";
|
||||||
import { createClient } from "redis";
|
import { createClient } from "redis";
|
||||||
|
|
||||||
import { auth, promoteAdminEmails, runAuthMigrations } from "./lib/auth.js";
|
import { auth, promoteAdminEmails, runAuthMigrations, verifyUsersWithoutMailTransport } from "./lib/auth.js";
|
||||||
import { authPool } from "./lib/db.js";
|
import { authPool } from "./lib/db.js";
|
||||||
import { env } from "./lib/env.js";
|
import { env } from "./lib/env.js";
|
||||||
|
|
||||||
@@ -20,6 +20,7 @@ try {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await retry("auth_migrations", runAuthMigrations);
|
await retry("auth_migrations", runAuthMigrations);
|
||||||
|
await verifyUsersWithoutMailTransport();
|
||||||
await promoteAdminEmails();
|
await promoteAdminEmails();
|
||||||
|
|
||||||
const app = new Hono();
|
const app = new Hono();
|
||||||
|
|||||||
+31
-13
@@ -4,7 +4,7 @@ import { admin, jwt } from "better-auth/plugins";
|
|||||||
import { getMigrations } from "better-auth/db/migration";
|
import { getMigrations } from "better-auth/db/migration";
|
||||||
|
|
||||||
import { authPool } from "./db.js";
|
import { authPool } from "./db.js";
|
||||||
import { sendTransactionalEmail } from "./mail.js";
|
import { hasMailTransport, sendTransactionalEmail } from "./mail.js";
|
||||||
import { getBoolSetting } from "./settings.js";
|
import { getBoolSetting } from "./settings.js";
|
||||||
import { env } from "./env.js";
|
import { env } from "./env.js";
|
||||||
|
|
||||||
@@ -72,20 +72,29 @@ export const auth = betterAuth({
|
|||||||
// Gates only the public sign-up endpoint. Users created through the
|
// Gates only the public sign-up endpoint. Users created through the
|
||||||
// admin plugin or OAuth callbacks take different paths and pass.
|
// admin plugin or OAuth callbacks take different paths and pass.
|
||||||
async before(user, ctx) {
|
async before(user, ctx) {
|
||||||
if (ctx?.path !== "/sign-up/email") return;
|
const data = { ...user };
|
||||||
const { rows } = await authPool.query<{ n: number }>(
|
// Without a mail transport the verification mail can never arrive —
|
||||||
`select count(*)::int as n from "user"`,
|
// mark every created account verified so nothing downstream nags
|
||||||
);
|
// "unverified" on users nobody can verify.
|
||||||
if (rows[0].n === 0) {
|
if (!(await hasMailTransport())) {
|
||||||
// Bootstrap: the first public signup becomes the instance admin.
|
data.emailVerified = true;
|
||||||
return { data: { ...user, role: "admin" } };
|
|
||||||
}
|
}
|
||||||
const enabled = await getBoolSetting("auth.signup_enabled", env.SIGNUP_ENABLED);
|
if (ctx?.path === "/sign-up/email") {
|
||||||
if (!enabled) {
|
const { rows } = await authPool.query<{ n: number }>(
|
||||||
throw new APIError("FORBIDDEN", {
|
`select count(*)::int as n from "user"`,
|
||||||
message: "Sign-up is disabled on this instance.",
|
);
|
||||||
});
|
if (rows[0].n === 0) {
|
||||||
|
// Bootstrap: the first public signup becomes the instance admin.
|
||||||
|
return { data: { ...data, role: "admin" } };
|
||||||
|
}
|
||||||
|
const enabled = await getBoolSetting("auth.signup_enabled", env.SIGNUP_ENABLED);
|
||||||
|
if (!enabled) {
|
||||||
|
throw new APIError("FORBIDDEN", {
|
||||||
|
message: "Sign-up is disabled on this instance.",
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return data.emailVerified === user.emailVerified ? undefined : { data };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -94,6 +103,9 @@ export const auth = betterAuth({
|
|||||||
sendOnSignUp: true,
|
sendOnSignUp: true,
|
||||||
autoSignInAfterVerification: true,
|
autoSignInAfterVerification: true,
|
||||||
async sendVerificationEmail({ user, url }) {
|
async sendVerificationEmail({ user, url }) {
|
||||||
|
// No transport at all → the mail can never arrive; the user was already
|
||||||
|
// marked verified at creation.
|
||||||
|
if (!(await hasMailTransport())) return;
|
||||||
// Verification is optional — a misconfigured transport must not fail
|
// Verification is optional — a misconfigured transport must not fail
|
||||||
// sign-up or sign-in.
|
// sign-up or sign-in.
|
||||||
try {
|
try {
|
||||||
@@ -143,6 +155,12 @@ export async function runAuthMigrations() {
|
|||||||
await migrations.runMigrations();
|
await migrations.runMigrations();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** No transport → existing unverified users can never resolve that state. */
|
||||||
|
export async function verifyUsersWithoutMailTransport() {
|
||||||
|
if (await hasMailTransport()) return;
|
||||||
|
await authPool.query(`update "user" set "emailVerified" = true where "emailVerified" = false`);
|
||||||
|
}
|
||||||
|
|
||||||
/** Bootstrap admins by email — run after migrations so the role column exists. */
|
/** Bootstrap admins by email — run after migrations so the role column exists. */
|
||||||
export async function promoteAdminEmails() {
|
export async function promoteAdminEmails() {
|
||||||
const emails = (env.AUTH_ADMIN_EMAILS ?? "")
|
const emails = (env.AUTH_ADMIN_EMAILS ?? "")
|
||||||
|
|||||||
@@ -30,6 +30,14 @@ async function resolveMailConfig() {
|
|||||||
} as const;
|
} as const;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// True when a mail transport exists (Resend key or SMTP host). Verification
|
||||||
|
// and reset mails only make sense when mail can actually leave the box.
|
||||||
|
export async function hasMailTransport(): Promise<boolean> {
|
||||||
|
const cfg = await resolveMailConfig();
|
||||||
|
if ("resendApiKey" in cfg && cfg.resendApiKey) return true;
|
||||||
|
return "smtp" in cfg && Boolean(cfg.smtp);
|
||||||
|
}
|
||||||
|
|
||||||
export async function sendTransactionalEmail(input: {
|
export async function sendTransactionalEmail(input: {
|
||||||
to: string;
|
to: string;
|
||||||
subject: string;
|
subject: string;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@primora/desktop",
|
"name": "@primora/desktop",
|
||||||
"version": "0.8.0",
|
"version": "0.8.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "Primora desktop shell — thin Tauri client for a self-hosted deployment",
|
"description": "Primora desktop shell — thin Tauri client for a self-hosted deployment",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Primora",
|
"productName": "Primora",
|
||||||
"version": "0.8.0",
|
"version": "0.8.1",
|
||||||
"identifier": "dev.tdvorak.primora",
|
"identifier": "dev.tdvorak.primora",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../ui"
|
"frontendDist": "../ui"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "primora",
|
"name": "primora",
|
||||||
"version": "0.8.0",
|
"version": "0.8.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"packageManager": "[email protected]",
|
"packageManager": "[email protected]",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
|
|||||||
Reference in new issue
Block a user