@vonall/auth 0.5.0 → 0.6.0

package/dist/server/service/mail.js

@@ -1,40 +1,38 @@
-/** The three mails of accounts, through the Product's mailer (`@vonall/mail`). */
+/** The three mails of accounts, through the Product's mailer (`@vonall/mail`), in the app's name and locale. */
 import { renderMail } from "@vonall/mail";
 import { m } from "../../messages.js";
-import { registry } from "../registry.js";
 import InvitationEmail from "../../templates/InvitationEmail.svelte";
 import ResetPasswordEmail from "../../templates/ResetPasswordEmail.svelte";
 import VerifyEmailEmail from "../../templates/VerifyEmailEmail.svelte";
-function footer() {
-    const { appName, origin } = registry();
-    return { appName, appLink: origin };
-}
-const footerText = (appName) => `\n---\n${appName}\n`;
-export async function sendPasswordResetEmail(user, url) {
-    const { mailer, appName } = registry();
-    await mailer.send({
-        to: user.email,
-        subject: m().resetSubject(appName),
-        text: m().resetText(user.name, appName, url) + footerText(appName),
-        html: renderMail(ResetPasswordEmail, { recipientName: user.name, link: url, ...footer() }),
-    });
-}
-export async function sendVerifyEmail(user, url) {
-    const { mailer, appName } = registry();
-    await mailer.send({
-        to: user.email,
-        subject: m().verifySubject(appName),
-        text: m().verifyText(user.name, appName, url) + footerText(appName),
-        html: renderMail(VerifyEmailEmail, { recipientName: user.name, link: url, ...footer() }),
-    });
-}
-export async function sendEinladungEmail(inviterName, to, einladung, locale) {
-    const { mailer, appName } = registry();
-    const validUntil = new Intl.DateTimeFormat(locale, { dateStyle: "long" }).format(einladung.expiresAt);
-    await mailer.send({
-        to,
-        subject: m().einladungSubject(inviterName, appName),
-        text: m().einladungText(inviterName, appName, einladung.link, validUntil) + footerText(appName),
-        html: renderMail(InvitationEmail, { inviterName, link: einladung.link, validUntil, ...footer() }),
-    });
+export function authMails(ctx) {
+    const { mailer, appName, origin, locale } = ctx;
+    const footer = { appName, appLink: origin };
+    const footerText = `\n---\n${appName}\n`;
+    return {
+        async passwordReset(user, url) {
+            await mailer.send({
+                to: user.email,
+                subject: m().resetSubject(appName),
+                text: m().resetText(user.name, appName, url) + footerText,
+                html: renderMail(ResetPasswordEmail, { recipientName: user.name, link: url, ...footer }),
+            });
+        },
+        async verify(user, url) {
+            await mailer.send({
+                to: user.email,
+                subject: m().verifySubject(appName),
+                text: m().verifyText(user.name, appName, url) + footerText,
+                html: renderMail(VerifyEmailEmail, { recipientName: user.name, link: url, ...footer }),
+            });
+        },
+        async einladung(inviterName, to, einladung) {
+            const validUntil = new Intl.DateTimeFormat(locale, { dateStyle: "long" }).format(einladung.expiresAt);
+            await mailer.send({
+                to,
+                subject: m().einladungSubject(inviterName, appName),
+                text: m().einladungText(inviterName, appName, einladung.link, validUntil) + footerText,
+                html: renderMail(InvitationEmail, { inviterName, link: einladung.link, validUntil, ...footer }),
+            });
+        },
+    };
 }

package/dist/testing/index.d.ts

@@ -1,15 +1,13 @@
+import { type AuthSchema } from "../schema/index.js";
+import type { AuthContext, Db } from "../server/context.js";
 import { type CreateAuthOptions } from "../server/create.js";
-import type { Db } from "../server/registry.js";
 /** Creates a user directly (the first one becomes admin, as in the app) and returns its id. */
-export declare function createUser(email?: string): Promise<string>;
+export declare function createUser(ctx: AuthContext, email?: string): Promise<string>;
 /** The wiring with test values: every option on, mail off, unless overridden; as a Product's `src/lib/auth.ts` does it. */
-export declare function testAuth(db: Db, overrides?: Partial<CreateAuthOptions>): {
-    handle: import("@sveltejs/kit/hooks").Handle;
+export declare function testAuth(db: Db, overrides?: Partial<CreateAuthOptions<AuthSchema<true, true>>>): {
+    ctx: AuthContext<AuthSchema<boolean, boolean>>;
+    sessionHandle: import("@sveltejs/kit/hooks").Handle;
     apiHandler: import("@sveltejs/kit").RequestHandler;
-    providers: {
-        github: boolean;
-        google: boolean;
-    };
     auth: import("better-auth").Auth<{
         plugins: [{
             id: "two-factor";

package/dist/testing/index.js

@@ -7,30 +7,27 @@ import { sveltekitCookies } from "better-auth/svelte-kit";
 import { createMailer } from "@vonall/mail";
 import { ac, roles } from "../permissions.js";
 import { authSchema } from "../schema/index.js";
-import { authOptions, registerAuth } from "../server/create.js";
-import { UserRepo } from "../server/repositories/UserRepo.js";
+import { createAuth } from "../server/create.js";
+import { userRepo } from "../server/repositories/UserRepo.js";
 /** Creates a user directly (the first one becomes admin, as in the app) and returns its id. */
-export async function createUser(email = "user@example.com") {
+export async function createUser(ctx, email = "user@example.com") {
     const id = crypto.randomUUID();
-    await UserRepo.insertUser({ id, email, name: "", emailVerified: true, createdAt: new Date(), updatedAt: new Date() });
+    await userRepo(ctx).insertUser({ id, email, name: "", emailVerified: true, createdAt: new Date(), updatedAt: new Date() });
     return id;
 }
 /** The wiring with test values: every option on, mail off, unless overridden; as a Product's `src/lib/auth.ts` does it. */
 export function testAuth(db, overrides = {}) {
-    const auth = betterAuth({
-        ...authOptions({
-            db,
-            schema: authSchema({ admin: true, mcp: true }),
-            secret: "test-secret-for-the-db-tests-only",
-            origin: "http://localhost:5173",
-            appName: "Test",
-            locale: "en-GB",
-            signupMode: "invite",
-            mailer: createMailer({ smtp: null }),
-            admin: true,
-            ...overrides,
-        }),
-        plugins: [twoFactor(), adminPlugin({ ac, roles }), sveltekitCookies(getRequestEvent)],
+    const wiring = createAuth({
+        db,
+        schema: authSchema({ admin: true, mcp: true }),
+        secret: "test-secret-for-the-db-tests-only",
+        origin: "http://localhost:5173",
+        appName: "Test",
+        locale: "en-GB",
+        signupMode: "invite",
+        mailer: createMailer({ smtp: null }),
+        ...overrides,
     });
-    return { auth, ...registerAuth(auth) };
+    const auth = betterAuth({ ...wiring.options, plugins: [twoFactor(), adminPlugin({ ac, roles }), sveltekitCookies(getRequestEvent)] });
+    return { auth, ...wiring.register(auth) };
 }

package/dist/ui/context.d.ts

@@ -1,4 +1,4 @@
-import type { SignupMode } from "../types.js";
+import type { AuthUiData } from "../server/loads.js";
 type Outcome<T = unknown> = Promise<{
     data?: T | null;
     error?: {
@@ -80,14 +80,13 @@ export type AuthClientLike = {
         providerId?: string;
     }): Outcome;
 };
-export type AuthUi = {
+export type AuthUi = AuthUiData & {
     authClient: AuthClientLike;
-    appName: string;
-    /** For dates, e.g. "de-CH". */
-    locale: string;
-    signupMode: SignupMode;
 };
 /** In the Product's root layout. */
-export declare function setAuthUi(ui: AuthUi): AuthUi;
+export declare function setAuthUi({ authClient }: {
+    authClient: AuthClientLike;
+}): void;
+/** In a component: the client, and the app's facts from the page data. */
 export declare function authUi(): AuthUi;
 export {};

package/dist/ui/context.js

@@ -1,17 +1,23 @@
 /**
- * What the auth components need from the Product, set once in its root layout (`setAuthUi({ … })` during component
- * init): the better-auth client (the Product builds it, see `src/lib/auth-client.ts`), the app's name, its locale and
- * signup mode.
+ * What the auth components need: the better-auth client, set once in the Product's root layout (`setAuthUi({ authClient })`
+ * during component init; the Product builds the client, see `src/lib/auth-client.ts`), and the app's name, locale
+ * and signup mode, which this package's loads put into the page data (`authUi` in `authLayoutLoad`, `homeLayoutLoad`,
+ * `einladungLoad`).
  */
 import { getContext, setContext } from "svelte";
+import { page } from "$app/state";
 const KEY = Symbol("vonall-auth-ui");
 /** In the Product's root layout. */
-export function setAuthUi(ui) {
-    return setContext(KEY, ui);
+export function setAuthUi({ authClient }) {
+    setContext(KEY, authClient);
 }
+/** In a component: the client, and the app's facts from the page data. */
 export function authUi() {
-    const ui = getContext(KEY);
-    if (!ui)
-        throw new Error("@vonall/auth: setAuthUi({ authClient, appName, locale, signupMode }) has not run in the root layout");
-    return ui;
+    const authClient = getContext(KEY);
+    if (!authClient)
+        throw new Error("@vonall/auth: setAuthUi({ authClient }) has not run in the root layout");
+    const data = page.data.authUi;
+    if (!data)
+        throw new Error("@vonall/auth: this page's data has no `authUi`; its load or its layout's must be one of this package's (authLayoutLoad, homeLayoutLoad, einladungLoad)");
+    return { authClient, ...data };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vonall/auth",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Accounts for a Web App Factory Product: better-auth with the hooks, the protected helpers, Einladungen, Konto, the auth pages and the settings; Admin as an option",
   "license": "MIT",
   "repository": {
@@ -102,8 +102,8 @@
     "tailwind-merge": "^3.7.0",
     "tailwind-variants": "^3.3.1",
     "uqr": "^0.1.3",
-    "@vonall/messages": "^0.1.0",
-    "@vonall/mail": "^0.2.0"
+    "@vonall/mail": "^0.2.0",
+    "@vonall/messages": "^0.1.0"
   },
   "scripts": {
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

package/dist/server/registry.js

@@ -1,22 +0,0 @@
-let current = null;
-export function setRegistry(registry) {
-    current = registry;
-}
-export function registry() {
-    if (!current)
-        throw new Error("@vonall/auth: authOptions() has not run; import the app's auth wiring (src/lib/auth.ts) first");
-    return current;
-}
-/** The Product's better-auth instance. */
-export function authInstance() {
-    const auth = registry().auth;
-    if (!auth)
-        throw new Error("@vonall/auth: registerAuth(auth) has not run; the app's auth wiring (src/lib/auth.ts) calls it after betterAuth()");
-    return auth;
-}
-export const consoleLog = {
-    debug: () => { },
-    info: (message, context) => console.info(message, context ?? ""),
-    warn: (message, context) => console.warn(message, context ?? ""),
-    error: (message, context, error) => console.error(message, context ?? "", error ?? ""),
-};