@ultimabase/password 0.1.2 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ultimabase/password
 
+## 0.2.0
+
+### Minor Changes
+
+- f3a1fac: `User.checkPassword({ id, password }, { as, client })` checks the current password before a sensitive action, opens no session, and is counted per user even without a client. A wrong current password, here and in `changePassword`, now answers `Wrong password.`
+- fcca799: `User.closeAccount({ id }, { as })` closes an account and keeps its row: it ends the user's sessions, unlinks their accounts, and runs the listeners sign-in methods register with `AuthApi.onCloseAccount`. password's deletes the hash, the tokens and the email requests, and sets `emailVerified` to `false`, so the email signs up again.
+- 99cdfec: `password()` adds a unique `email` field to the user model, which the user and Master read and only Master writes; the password account follows it. `requestEmailChange` and `confirmEmailChange` change the email from a link sent to the new address, and `sendEmail` tells the old one with an `'emailChanged'` email. `AuthApi.unlinkAccount` unlinks one method's account.
+
+  Breaking: `Email` is a union, so read `token` after checking `kind`; a user model that declares its own `email` stops startup; users stored before this release read `email: null` until a Master `User.update({ where: { id }, data: { email } })` writes their account's email.
+
+### Patch Changes
+
+- Updated dependencies [fcca799]
+- Updated dependencies [99cdfec]
+- Updated dependencies [2c3bf4e]
+- Updated dependencies [fd1263e]
+- Updated dependencies [6d4f980]
+  - @ultimabase/auth@0.2.0
+  - ultimabase@0.2.0
+
 ## 0.1.2
 
 ### Patch Changes

package/dist/core.d.ts

@@ -1,5 +1,6 @@
 import type { AuthApi } from '@ultimabase/auth';
 import type { Client, ExposedModel, Logger, Row } from 'ultimabase';
+import type { SendEmail } from './email-functions.ts';
 import type { Attempt } from './models.ts';
 /** The method `AuthAccount` links a password's email with (D-113). */
 export declare const method = "password";
@@ -12,6 +13,7 @@ export interface State {
     readonly logger: Logger;
     /** The sends under way, which stopping waits for (D-117). */
     readonly sending: Set<Promise<void>>;
+    readonly sendEmail: SendEmail | undefined;
 }
 /** What a sign-in returns: its session, and the user read as itself. */
 export interface SignedIn<U = Row> {
@@ -28,7 +30,8 @@ export interface SignedIn<U = Row> {
 export declare const attemptOf: (subject: string, client: Client | undefined) => Attempt;
 /**
  * Creates the user, its account and its hash in one transaction, as Master:
- * the caller's fields were checked against the list (D-113).
+ * the caller's fields were checked against the list (D-113). The email's
+ * hook links the account (D-162).
  */
 export declare function createUser(state: State, email: string, password: string, data: object): Promise<{
     readonly user: Row;
@@ -44,8 +47,9 @@ export declare function verified(state: State, email: string, password: string,
 /** Checks `userId`'s current password, counting the attempt. */
 export declare function checkCurrent(userId: string, password: string, attempt: Attempt): Promise<void>;
 /**
- * Replaces `userId`'s hash, ends every session of the user and deletes its
- * pending reset tokens (D-117); the new stamp.
+ * Replaces `userId`'s hash, or gives one to an email without (D-162), ends
+ * every session of the user and deletes its pending reset tokens (D-117);
+ * the new stamp.
  */
 export declare function setPassword(state: State, userId: string, password: string): Promise<string>;
 /**

package/dist/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,EACX,MAAM,EAEN,YAAY,EACZ,MAAM,EAEN,GAAG,EAEH,MAAM,YAAY,CAAA;AAInB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAK1C,sEAAsE;AACtE,eAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,qEAAqE;AACrE,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAA;IAC5B,2EAA2E;IAC3E,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,KAAK,CAAA;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;CACpC;AAED,wEAAwE;AACxE,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG;IAChC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAA;CACvB;AAKD,4EAA4E;AAC5E,eAAO,MAAM,SAAS,YACZ,MAAM,UACP,MAAM,GAAG,SAAS,KACxB,OACqE,CAAA;AAExE;;;GAGG;AACH,wBAAsB,UAAU,CAC/B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CASzD;AAyCD,uEAAuE;AACvE,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACtB;AAED,wEAAwE;AACxE,wBAAsB,QAAQ,CAC7B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAOnB;AAED,gEAAgE;AAChE,wBAAsB,YAAY,CACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAChC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAaD;;;;GAIG;AACH,wBAAsB,QAAQ,CAC7B,KAAK,EAAE,KAAK,EACZ,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAC3B,MAAM,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAAC,QAAQ,CAAC,CAQnB"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,EACX,MAAM,EAEN,YAAY,EACZ,MAAM,EAEN,GAAG,EAEH,MAAM,YAAY,CAAA;AAGnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAK1C,sEAAsE;AACtE,eAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,qEAAqE;AACrE,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAA;IAC5B,2EAA2E;IAC3E,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,KAAK,CAAA;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACpC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;CACzC;AAED,wEAAwE;AACxE,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG;IAChC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAA;CACvB;AASD,4EAA4E;AAC5E,eAAO,MAAM,SAAS,YACZ,MAAM,UACP,MAAM,GAAG,SAAS,KACxB,OACqE,CAAA;AAExE;;;;GAIG;AACH,wBAAsB,UAAU,CAC/B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAWzD;AAyCD,uEAAuE;AACvE,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACtB;AAED,wEAAwE;AACxE,wBAAsB,QAAQ,CAC7B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAOnB;AAED,gEAAgE;AAChE,wBAAsB,YAAY,CACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAChC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAaD;;;;GAIG;AACH,wBAAsB,QAAQ,CAC7B,KAAK,EAAE,KAAK,EACZ,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAC3B,MAAM,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAAC,QAAQ,CAAC,CAQnB"}

package/dist/core.js

@@ -10,18 +10,20 @@ const M = { as: master };
 /** The method `AuthAccount` links a password's email with (D-113). */
 export const method = 'password';
 const invalid = () => new PublicError('INVALID_CREDENTIALS', 'Wrong email or password.');
+/** The current password is known to be the user's: no email to name (D-161). */
+const wrongPassword = () => new PublicError('INVALID_CREDENTIALS', 'Wrong password.');
 /** The attempt a client makes for `subject`; server code is not counted. */
 export const attemptOf = (subject, client) => client === undefined ? undefined : { subject, address: client.address };
 /**
  * Creates the user, its account and its hash in one transaction, as Master:
- * the caller's fields were checked against the list (D-113).
+ * the caller's fields were checked against the list (D-113). The email's
+ * hook links the account (D-162).
  */
 export async function createUser(state, email, password, data) {
     const hash = await hashPassword(password);
     const stamp = randomUUID();
     return transaction(async () => {
-        const user = await state.users.queries.create({ data }, M);
-        await state.auth.linkAccount(user.id, method, email);
+        const user = await state.users.queries.create({ data: { ...data, email } }, M);
         await PasswordHash.create({ data: { userId: user.id, hash, stamp } }, M);
         return { user, stamp };
     });
@@ -73,22 +75,28 @@ export async function verified(state, email, password, attempt) {
 export async function checkCurrent(userId, password, attempt) {
     await limited(attempt, async () => {
         if ((await matches(userId, password)) === undefined)
-            throw invalid();
+            throw wrongPassword();
     });
 }
 /**
- * Replaces `userId`'s hash, ends every session of the user and deletes its
- * pending reset tokens (D-117); the new stamp.
+ * Replaces `userId`'s hash, or gives one to an email without (D-162), ends
+ * every session of the user and deletes its pending reset tokens (D-117);
+ * the new stamp.
  */
 export async function setPassword(state, userId, password) {
     const stored = await PasswordHash.findUnique({ where: { userId } }, M);
-    if (stored === null) {
+    const linked = stored !== null ||
+        (await state.auth.subjectOf(userId, method)) !== undefined;
+    if (!linked) {
         throw new PublicError('NOT_FOUND', `User ${userId} has no password: sign it up with signUp.`);
     }
     const hash = await hashPassword(password);
     const stamp = randomUUID();
     await transaction(async () => {
-        await PasswordHash.update({ where: { userId }, data: { hash, stamp } }, M);
+        const data = { hash, stamp };
+        await (stored === null
+            ? PasswordHash.create({ data: { userId, ...data } }, M)
+            : PasswordHash.update({ where: { userId }, data }, M));
         await PasswordToken.deleteMany({ where: { userId, kind: 'reset' } }, M);
         await state.auth.revokeSessions(userId);
     });

package/dist/email-field.d.ts

@@ -0,0 +1,35 @@
+import type { Caller } from 'ultimabase';
+import type { State } from './core.ts';
+type Emailed = {
+    readonly id: string;
+    readonly email: string | null;
+};
+type Draft = {
+    email?: string | null | undefined;
+    emailVerified?: boolean | undefined;
+};
+/** Only the user itself and Master read the email. */
+export declare const readsEmail: (facts: {
+    readonly caller: Caller;
+    readonly record: {
+        readonly id: string;
+    };
+}) => boolean;
+/** Normalizes a created user's email, as at sign-up. */
+export declare function creating(data: Draft): void;
+/** Links the created user's email as its password account. */
+export declare function created(state: State, record: Emailed): Promise<void>;
+/**
+ * Normalizes an updated email, refuses `null` while the account is linked,
+ * and unverifies another email unless the write verifies it.
+ */
+export declare function updating(state: State, record: Emailed, data: Draft): Promise<void>;
+/**
+ * Moves the password account to the new email, in the write's transaction,
+ * and deletes the links the old one received.
+ */
+export declare function updated(state: State, record: Emailed, previous: Emailed): Promise<void>;
+/** Tells the old address, once the change commits, when `sendEmail` exists. */
+export declare function committed(state: State, record: Emailed, previous: Emailed): void;
+export {};
+//# sourceMappingURL=email-field.d.ts.map

package/dist/email-field.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"email-field.d.ts","sourceRoot":"","sources":["../src/email-field.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAQtC,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AACrE,KAAK,KAAK,GAAG;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACjC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACnC,CAAA;AAED,sDAAsD;AACtD,eAAO,MAAM,UAAU,UAAW;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CACxC,KAAG,OAKH,CAAA;AAED,wDAAwD;AACxD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAI1C;AAED,8DAA8D;AAC9D,wBAAsB,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAC7B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CAYf;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC5B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,+EAA+E;AAC/E,wBAAgB,SAAS,CACxB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,GACf,IAAI,CAcN"}

package/dist/email-field.js

@@ -0,0 +1,77 @@
+import { isMaster, master, PublicError } from 'ultimabase';
+import { method } from './core.js';
+import { later } from './email-functions.js';
+import { emailOf, valid } from './input.js';
+import { PasswordToken } from './tokens.js';
+const M = { as: master };
+/** Only the user itself and Master read the email. */
+export const readsEmail = (facts) => {
+    const { caller, record } = facts;
+    return (isMaster(caller) || (caller.kind === 'user' && caller.user.id === record.id));
+};
+/** Normalizes a created user's email, as at sign-up. */
+export function creating(data) {
+    if (typeof data.email === 'string') {
+        data.email = valid(emailOf, data.email, 'email');
+    }
+}
+/** Links the created user's email as its password account. */
+export async function created(state, record) {
+    if (record.email === null)
+        return;
+    await state.auth.linkAccount(record.id, method, record.email);
+}
+/**
+ * Normalizes an updated email, refuses `null` while the account is linked,
+ * and unverifies another email unless the write verifies it.
+ */
+export async function updating(state, record, data) {
+    if (data.email === undefined)
+        return;
+    const subject = await state.auth.subjectOf(record.id, method);
+    if (data.email === null) {
+        if (subject === undefined)
+            return;
+        const message = 'closeAccount removes the email.';
+        throw new PublicError('VALIDATION_FAILED', `email: ${message}`, {
+            details: { issues: [{ path: ['email'], message }] },
+        });
+    }
+    data.email = valid(emailOf, data.email, 'email');
+    if (data.email !== subject)
+        data.emailVerified ??= false;
+}
+/**
+ * Moves the password account to the new email, in the write's transaction,
+ * and deletes the links the old one received.
+ */
+export async function updated(state, record, previous) {
+    if (record.email === null || record.email === previous.email)
+        return;
+    const { auth } = state;
+    const subject = await auth.subjectOf(record.id, method);
+    // Filling the field from the account changes nothing else.
+    if (subject === record.email)
+        return;
+    if (subject !== undefined)
+        await auth.unlinkAccount(record.id, method);
+    await auth.linkAccount(record.id, method, record.email);
+    const where = { userId: record.id, kind: { in: ['reset', 'verify'] } };
+    await PasswordToken.deleteMany({ where }, M);
+}
+/** Tells the old address, once the change commits, when `sendEmail` exists. */
+export function committed(state, record, previous) {
+    const { sendEmail } = state;
+    const [from, to] = [previous.email, record.email];
+    if (sendEmail === undefined || from === null || to === null || from === to) {
+        return;
+    }
+    later(state, async () => {
+        await sendEmail({
+            kind: 'emailChanged',
+            to: from,
+            newEmail: to,
+            userId: record.id,
+        });
+    });
+}

package/dist/email-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-functions.d.ts","sourceRoot":"","sources":["../src/email-functions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAiC,WAAW,EAAE,MAAM,YAAY,CAAA;AACvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAStC,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGnD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAUnE;AAED,6CAA6C;AAC7C,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEvD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,CACpB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,KACN,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAA;AAErC,eAAO,MAAM,QAAQ,cACR,SAAS,KAAG,MAOvB,CAAA;AAWF,4EAA4E;AAC5E,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,KAAK,EACpB,IAAI,EAAE,MAAM,GACV,SAAS,aAAa,EAAE,CAmE1B"}
+{"version":3,"file":"email-functions.d.ts","sourceRoot":"","sources":["../src/email-functions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAIN,WAAW,EAEX,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAWtC,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGnD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAUnE;AAED,6CAA6C;AAC7C,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEvD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,CACpB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,KACN,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAA;AAErC,eAAO,MAAM,QAAQ,cACR,SAAS,KAAG,MAOvB,CAAA;AAWF,4EAA4E;AAC5E,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,KAAK,EACpB,IAAI,EAAE,MAAM,GACV,SAAS,aAAa,EAAE,CAqE1B"}

package/dist/email-functions.js

@@ -1,6 +1,6 @@
-import { allow, defineFunction, master, PublicError } from 'ultimabase';
-import { method, setPassword } from './core.js';
-import { outputSchema, requestResetInput, resetPasswordInput, verifyEmailInput, } from './input.js';
+import { allow, defineFunction, master, PublicError, transaction, } from 'ultimabase';
+import { attemptOf, checkCurrent, method, setPassword } from './core.js';
+import { confirmEmailChangeInput, outputSchema, requestEmailChangeInput, requestResetInput, resetPasswordInput, verifyEmailInput, } from './input.js';
 import { requestLimited } from './models.js';
 import { emailLimited, issueToken, redeemToken } from './tokens.js';
 /**
@@ -22,7 +22,7 @@ export const mailerOf = (sendEmail) => async (kind, userId, to) => {
     const refused = await emailLimited(userId);
     if (refused !== undefined)
         return refused;
-    const token = await issueToken(userId, kind);
+    const token = await issueToken(userId, kind, to);
     await sendEmail({ kind, to, token, userId });
     return undefined;
 };
@@ -60,7 +60,7 @@ export function emailFunctions(stateOf, mail) {
         output: done,
         run: async ({ input: { input } }) => {
             const state = stateOf();
-            const userId = await redeemToken(input.token, 'reset');
+            const { userId } = await redeemToken(input.token, 'reset');
             await setPassword(state, userId, input.password);
             await verify(state, userId);
             return true;
@@ -71,7 +71,8 @@ export function emailFunctions(stateOf, mail) {
         input: verifyEmailInput,
         output: done,
         run: async ({ input: { input } }) => {
-            await verify(stateOf(), await redeemToken(input.token, 'verify'));
+            const { userId } = await redeemToken(input.token, 'verify');
+            await verify(stateOf(), userId);
             return true;
         },
     }).with({ access: allow.public });
@@ -103,5 +104,46 @@ export function emailFunctions(stateOf, mail) {
         resetPassword,
         verifyEmail,
         sendVerificationEmail,
+        ...emailChangeFunctions(stateOf, mail),
     ];
 }
+/** `requestEmailChange` and `confirmEmailChange` (D-162). */
+function emailChangeFunctions(stateOf, mail) {
+    const requestEmailChange = defineFunction({
+        name: 'requestEmailChange',
+        input: requestEmailChangeInput,
+        output: done,
+        run: async ({ input: { input }, caller, client }) => {
+            if (caller.kind !== 'user') {
+                throw new PublicError('UNAUTHENTICATED', 'requestEmailChange needs a signed-in user.');
+            }
+            const { id } = caller.user;
+            await checkCurrent(id, input.currentPassword, attemptOf(id, client));
+            const { newEmail } = input;
+            // The caller proved the password: telling it is no enumeration.
+            if ((await stateOf().auth.accountOf(method, newEmail)) !== undefined) {
+                throw new PublicError('UNIQUE_VIOLATION', 'This email has an account.');
+            }
+            const refused = await mail('emailChange', id, newEmail);
+            if (refused !== undefined)
+                throw refused;
+            return true;
+        },
+    }).with({ access: allow.public });
+    const confirmEmailChange = defineFunction({
+        name: 'confirmEmailChange',
+        input: confirmEmailChangeInput,
+        output: done,
+        run: async ({ input: { input } }) => {
+            const { users } = stateOf();
+            // A taken email undoes the redeem too: the link works until it expires.
+            await transaction(async () => {
+                const { userId, email } = await redeemToken(input.token, 'emailChange');
+                const data = { email, emailVerified: true };
+                await users.queries.update({ where: { id: userId }, data }, M);
+            });
+            return true;
+        },
+    }).with({ access: allow.public });
+    return [requestEmailChange, confirmEmailChange];
+}

package/dist/input.d.ts

@@ -96,6 +96,18 @@ export declare const verifyEmailInput: StandardSchema<Named<{
 }>, Named<{
     readonly token: string;
 }>>;
+type RequestEmailChange = {
+    readonly newEmail: string;
+    readonly currentPassword: string;
+};
+/** What `requestEmailChange` takes: the new email and the password (D-162). */
+export declare const requestEmailChangeInput: StandardSchema<Named<RequestEmailChange>, Named<RequestEmailChange>>;
+/** What `confirmEmailChange` takes: the email's token (D-162). */
+export declare const confirmEmailChangeInput: StandardSchema<Named<{
+    readonly token: string;
+}>, Named<{
+    readonly token: string;
+}>>;
 /** The email, the password and the listed user fields, by their names. */
 export declare const signUpInput: (fields: ReadonlyMap<string, Property>) => StandardSchema<Named<SignUp>, Named<SignUp>>;
 /** An output's schema: typed and exported, never validated (D-45). */

package/dist/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../src/input.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../src/input.ts"],"names":[],"mappings":"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"}

package/dist/input.js

@@ -210,6 +210,13 @@ export const resetPasswordInput = namedInput('ResetPassword', new Map([
 ]));
 /** What `verifyEmail` takes: the email's token (D-117). */
 export const verifyEmailInput = namedInput('VerifyEmail', new Map([['token', property(text, string)]]));
+/** What `requestEmailChange` takes: the new email and the password (D-162). */
+export const requestEmailChangeInput = namedInput('RequestEmailChange', new Map([
+    ['newEmail', email],
+    ['currentPassword', property(text, string)],
+]));
+/** What `confirmEmailChange` takes: the email's token (D-162). */
+export const confirmEmailChangeInput = namedInput('ConfirmEmailChange', new Map([['token', property(text, string)]]));
 /** The email, the password and the listed user fields, by their names. */
 export const signUpInput = (fields) => namedInput('SignUp', new Map([
     ['email', email],

package/dist/models.d.ts

@@ -31,16 +31,20 @@ export declare const PasswordRequest: ModelOf<'PasswordRequest', RequestFields,
  * (D-114).
  */
 export declare function networkOf(address: string): string;
-/** Where an attempt comes from; `undefined` for server code, not counted. */
+/**
+ * Where an attempt comes from: a client's address, none for server code
+ * that is still counted (D-161), `undefined` for server code that is not.
+ */
 export type Attempt = {
     readonly subject: string;
-    readonly address: string;
+    readonly address?: string;
 } | undefined;
 /**
  * Counts an attempt as failed until `run` succeeds, so concurrent attempts
  * cannot pass the limit (D-113, D-114). Within 15 minutes, the 11th from one
- * address on a subject is refused, as the 101st on it or from the address;
- * a success clears its address's count, a busy refusal is not counted.
+ * address on a subject is refused, as the 101st on it or from the address,
+ * and the 11th without an address on a subject (D-161); a success clears
+ * its address's count, a busy refusal is not counted.
  */
 export declare function limited<T>(attempt: Attempt, run: () => Promise<T>): Promise<T>;
 /** What the hourly limits count (D-114, D-117). */

package/dist/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAuB,WAAW,EAAE,MAAM,YAAY,CAAA;AAO7D,eAAO,MAAM,IAAI,EAAE,MAAuB,CAAA;AAE1C,KAAK,UAAU,GAAG;IACjB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IACzD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,mEAAmE;IACnE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;CACxD,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,cAAc,EAAE,UAAU,EAAE,EAAE,CAQ9D,CAAA;AAEH,KAAK,aAAa,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,EAAE,CASvE,CAAA;AAEH,KAAK,aAAa,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,EAAE,CASvE,CAAA;AAEH;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMjD;AAYD,6EAA6E;AAC7E,MAAM,MAAM,OAAO,GAClB;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAA;AAenE;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC9B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAiCZ;AAED,mDAAmD;AACnD,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;AAEjE;;;;GAIG;AACH,wBAAsB,MAAM,CAC3B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAmBlC;AAED,4FAA4F;AAC5F,wBAAsB,cAAc,CACnC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAGf"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAuB,WAAW,EAAE,MAAM,YAAY,CAAA;AAO7D,eAAO,MAAM,IAAI,EAAE,MAAuB,CAAA;AAE1C,KAAK,UAAU,GAAG;IACjB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IACzD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,mEAAmE;IACnE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;CACxD,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,cAAc,EAAE,UAAU,EAAE,EAAE,CAQ9D,CAAA;AAEH,KAAK,aAAa,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,EAAE,CASvE,CAAA;AAEH,KAAK,aAAa,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,EAAE,CASvE,CAAA;AAEH;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMjD;AAYD;;;GAGG;AACH,MAAM,MAAM,OAAO,GAClB;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAA;AAoCpE;;;;;;GAMG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC9B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CA+BZ;AAED,mDAAmD;AACnD,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;AAEjE;;;;GAIG;AACH,wBAAsB,MAAM,CAC3B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAmBlC;AAED,4FAA4F;AAC5F,wBAAsB,cAAc,CACnC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAGf"}

package/dist/models.js

@@ -53,32 +53,46 @@ const tooMany = (oldest, span, now) => new PublicError('TOO_MANY_ATTEMPTS', 'Too
         retryAfter: Math.max(Math.ceil((oldest.getTime() + span - now) / 1000), 1),
     },
 });
+/** What an attempt without an address is stored with; no address is it. */
+const server = 'server';
 /** The `n`th most recent failure but `id` matching `where`, if there is one. */
 async function nth(where, id, n) {
     const failures = await PasswordAttempt.findMany({ where: { ...where, id: { not: id } }, orderBy: { at: 'desc' }, take: n }, M);
     return failures[n - 1]?.at;
 }
+/**
+ * The failures but `id` that refuse the attempt: from one address, the 10th
+ * on the subject or the 100th on it or from the address; without one, the
+ * 10th on the subject from anywhere, and no address is filled (D-161).
+ */
+async function reached(subject, address, id) {
+    if (address === undefined)
+        return [await nth({ subject }, id, limit)];
+    return [
+        await nth({ subject, address }, id, limit),
+        await nth({ subject }, id, ceiling),
+        await nth({ address }, id, ceiling),
+    ];
+}
 /**
  * Counts an attempt as failed until `run` succeeds, so concurrent attempts
  * cannot pass the limit (D-113, D-114). Within 15 minutes, the 11th from one
- * address on a subject is refused, as the 101st on it or from the address;
- * a success clears its address's count, a busy refusal is not counted.
+ * address on a subject is refused, as the 101st on it or from the address,
+ * and the 11th without an address on a subject (D-161); a success clears
+ * its address's count, a busy refusal is not counted.
  */
 export async function limited(attempt, run) {
     if (attempt === undefined)
         return run();
     const { subject } = attempt;
-    const address = networkOf(attempt.address);
+    const network = attempt.address === undefined ? undefined : networkOf(attempt.address);
+    const address = network ?? server;
     const now = Date.now();
     const since = new Date(now - window);
     await PasswordAttempt.deleteMany({ where: { at: { lte: since } } }, M);
     const { id } = await PasswordAttempt.create({ data: { subject, address, at: new Date(now) } }, M);
     // Several may be reached: the latest says when to retry.
-    const [oldest] = [
-        await nth({ subject, address }, id, limit),
-        await nth({ subject }, id, ceiling),
-        await nth({ address }, id, ceiling),
-    ]
+    const [oldest] = (await reached(subject, network, id))
         .filter((at) => at !== undefined)
         .toSorted((a, b) => b.getTime() - a.getTime());
     if (oldest !== undefined) {

package/dist/plugin.d.ts

@@ -45,6 +45,15 @@ export interface PasswordCommands<F> {
         readonly id: string;
         readonly password: string;
     }, options?: Options): Promise<void>;
+    /**
+     * Checks the user's current password before a sensitive action, as
+     * Master or as the user; opens no session. Always counted: with a
+     * `client` as changePassword, otherwise 10 failures per user (D-161).
+     */
+    checkPassword(args: {
+        readonly id: string;
+        readonly password: string;
+    }, options?: SignInOptions): Promise<void>;
 }
 /** password's types (D-57). */
 export interface Password extends PluginTypes {
@@ -55,6 +64,11 @@ export interface Password extends PluginTypes {
         readonly emailVerified: Field<boolean, {
             readonly default: false;
         }>;
+        /** The password account's email (D-162). */
+        readonly email: Field<string | null, {
+            readonly optional: true;
+            readonly unique: true;
+        }>;
     };
     readonly commands: PasswordCommands<this['fields']>;
 }

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}