mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-29 00:01:20 +00:00
feat: instance administration, bootstrap admin, and managed-tier OAuth gate
Self-hosted instances are now email/password only — OAuth providers (GitHub/Google/Discord/Microsoft) activate solely when PRIMORA_MANAGED=true, reserved for the future hosted tier. Sign-up lifecycle: the first public sign-up becomes the instance admin; after bootstrap, sign-up closes by default. A better-auth databaseHook gates only /sign-up/email, so admin-created users and OAuth flows bypass it. The login page reads GET /instance/public to hide the sign-up tab, show the bootstrap notice, and render only the providers the instance offers. Instance settings live in core.settings (migration 00010) and resolve in-app > env > built-in default, cached 15s. Platform admins (better-auth user.role) manage sign-up, mail transport, and rate limits via GET/PUT/DELETE /instance/settings or the new Settings → Instance tab. Secret values are AES-256-GCM encrypted at rest with PRIMORA_ENCRYPTION_KEY, never returned by the API, and decrypted by the auth service at send time. Auth service reads the same settings table for the sign-up gate and mail config, so in-app changes take effect without a restart. 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
1214108d6b
commit
c6166de886
36 files changed
+1729
-109
No files matched your search
+34
-22
@@ -2,23 +2,33 @@ import nodemailer from "nodemailer";
|
||||
import { Resend } from "resend";
|
||||
|
||||
import { env } from "./env.js";
|
||||
import { getStringSetting } from "./settings.js";
|
||||
|
||||
const resend = env.RESEND_API_KEY ? new Resend(env.RESEND_API_KEY) : null;
|
||||
|
||||
const transporter =
|
||||
!resend && env.SMTP_HOST
|
||||
? nodemailer.createTransport({
|
||||
host: env.SMTP_HOST,
|
||||
port: env.SMTP_PORT,
|
||||
secure: false,
|
||||
auth: env.SMTP_USER
|
||||
? {
|
||||
user: env.SMTP_USER,
|
||||
pass: env.SMTP_PASSWORD,
|
||||
}
|
||||
: undefined,
|
||||
})
|
||||
: null;
|
||||
// Mail config resolves per send: in-app setting → env var. This keeps
|
||||
// SMTP/Resend editable from the dashboard without restarting the service.
|
||||
async function resolveMailConfig() {
|
||||
const from = (await getStringSetting("mail.from", env.MAIL_FROM))!;
|
||||
const resendApiKey = await getStringSetting("mail.resend_api_key", env.RESEND_API_KEY);
|
||||
if (resendApiKey) {
|
||||
return { from, resendApiKey } as const;
|
||||
}
|
||||
const host = await getStringSetting("mail.smtp_host", env.SMTP_HOST);
|
||||
const portRaw = await getStringSetting("mail.smtp_port", String(env.SMTP_PORT));
|
||||
const user = await getStringSetting("mail.smtp_user", env.SMTP_USER);
|
||||
const pass = await getStringSetting("mail.smtp_password", env.SMTP_PASSWORD);
|
||||
const secureRaw = await getStringSetting("mail.smtp_secure", String(env.SMTP_SECURE));
|
||||
return {
|
||||
from,
|
||||
smtp: host
|
||||
? {
|
||||
host,
|
||||
port: Number(portRaw) || 1025,
|
||||
secure: secureRaw === "true",
|
||||
auth: user ? { user, pass } : undefined,
|
||||
}
|
||||
: undefined,
|
||||
} as const;
|
||||
}
|
||||
|
||||
export async function sendTransactionalEmail(input: {
|
||||
to: string;
|
||||
@@ -26,9 +36,12 @@ export async function sendTransactionalEmail(input: {
|
||||
text: string;
|
||||
html: string;
|
||||
}) {
|
||||
if (resend) {
|
||||
const cfg = await resolveMailConfig();
|
||||
|
||||
if ("resendApiKey" in cfg && cfg.resendApiKey) {
|
||||
const resend = new Resend(cfg.resendApiKey);
|
||||
await resend.emails.send({
|
||||
from: env.MAIL_FROM,
|
||||
from: cfg.from,
|
||||
to: [input.to],
|
||||
subject: input.subject,
|
||||
text: input.text,
|
||||
@@ -37,16 +50,15 @@ export async function sendTransactionalEmail(input: {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!transporter) {
|
||||
if (!("smtp" in cfg) || !cfg.smtp) {
|
||||
throw new Error("No mail transport configured for auth service.");
|
||||
}
|
||||
|
||||
await transporter.sendMail({
|
||||
from: env.MAIL_FROM,
|
||||
await nodemailer.createTransport(cfg.smtp).sendMail({
|
||||
from: cfg.from,
|
||||
to: input.to,
|
||||
subject: input.subject,
|
||||
text: input.text,
|
||||
html: input.html,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user