cauthy-auth 0.24.3 → 0.26.0

package/dist/react.d.mts

@@ -210,7 +210,7 @@ interface PublicSession {
     expiresAt: string;
 }
 
-type AuthField = 'email' | 'password' | 'newPassword' | 'name' | 'code';
+type AuthField = 'email' | 'password' | 'newPassword' | 'name' | 'code' | 'organization';
 
 /** Whether this browser can use a passkey at all. */
 declare function canUsePasskeys(): boolean;
@@ -245,6 +245,11 @@ interface AuthMethods {
     }[];
     /** Whether people may create an account themselves. */
     signUp: boolean;
+    /** Set when the application's system makes an organization per sign-up: the form asks the company's name. */
+    organization?: {
+        ask: boolean;
+        required: boolean;
+    };
     magicLink: boolean;
     /** Whether to offer a passkey. */
     passkey: boolean;
@@ -592,21 +597,34 @@ interface AuthClient {
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
         }>>;
-        /** With address and password. `mfa_required`: ask for the code and call `signIn.mfa`. */
+        /**
+         * With address and password. `mfa_required`: ask for the code and call
+         * `signIn.mfa`. `method: 'email'` says the code was just mailed to the
+         * account's address (it has no factor of its own and the workspace, or
+         * the sign-in's risk, asked a second step): say so, and offer
+         * `mfaSendEmail` for another.
+         */
         email(form: {
             email: string;
             password: string;
             captchaToken?: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
-        }> | AuthResult<'mfa_required'>>;
-        /** The second step: the code of the authenticator app, or a recovery code. */
+        }> | AuthResult<'mfa_required', {
+            method?: 'email';
+        }>>;
+        /** The second step: the code of the authenticator app, the phone, the email, or a recovery code. */
         mfa(form: {
             code: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
         }>>;
-        /** While the second step is asked for: whether the account has an authenticator app, the phone (masked) a code can be sent to, and phones that approve sign-ins. */
+        /**
+         * While the second step is asked for: whether the account has an
+         * authenticator app, the phone (masked) a code can be sent to, phones
+         * that approve sign-ins, and the address (masked) a code went to when
+         * the step is by email.
+         */
         mfaMethods(): Promise<AuthResult<'ok', {
             totp: boolean;
             phone: {
@@ -616,6 +634,13 @@ interface AuthClient {
             push: {
                 devices: number;
             } | null;
+            email: {
+                to: string;
+            } | null;
+        }>>;
+        /** Mails the sign-in's code again, when its second step is by email; `mfa` takes it. A few per sign-in. */
+        mfaSendEmail(): Promise<AuthResult<'sent', {
+            sentTo: string;
         }>>;
         /**
          * Sends a push to the account's phones (the application's app, with
@@ -764,6 +789,7 @@ interface AuthClient {
             email: string;
             password: string;
             name?: string;
+            organization?: string;
             captchaToken?: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
@@ -782,9 +808,12 @@ interface AuthClient {
         password: string;
     }): Promise<AuthResult<'changed'>>;
     /** Confirms the address, with the token the mailed link opened the page with (`token`). */
+    /** Confirms the address a mailed link is for. The person is signed in from the link when their account asks no second step. */
     verifyEmail(form: {
         token: string;
-    }): Promise<AuthResult<'verified'>>;
+    }): Promise<AuthResult<'verified'> | AuthResult<'signed_in', {
+        session: PublicSession;
+    }>>;
     signOut(): Promise<AuthResult<'signed_out'>>;
     /** The signed-in person's own account. */
     account: AccountClient;
@@ -826,12 +855,17 @@ interface AuthTexts {
     forgotPassword: string;
     noAccount: string;
     createAccount: string;
+    /** The label of the company's name, asked when the application's system makes an organization per sign-up. */
+    company: string;
     haveAccount: string;
     sendLink: string;
     linkSent: string;
     codeHelp: string;
     /** The second step when it is a phone only. */
     codeHelpPhone: string;
+    /** The second step by email (the account has no factor): "{to}" is the address, masked. */
+    codeHelpEmail: string;
+    sendEmailAgain: string;
     /** "{to}" is the phone, masked. */
     sendCodeSms: string;
     sendCodeWhatsapp: string;

package/dist/react.d.ts

@@ -210,7 +210,7 @@ interface PublicSession {
     expiresAt: string;
 }
 
-type AuthField = 'email' | 'password' | 'newPassword' | 'name' | 'code';
+type AuthField = 'email' | 'password' | 'newPassword' | 'name' | 'code' | 'organization';
 
 /** Whether this browser can use a passkey at all. */
 declare function canUsePasskeys(): boolean;
@@ -245,6 +245,11 @@ interface AuthMethods {
     }[];
     /** Whether people may create an account themselves. */
     signUp: boolean;
+    /** Set when the application's system makes an organization per sign-up: the form asks the company's name. */
+    organization?: {
+        ask: boolean;
+        required: boolean;
+    };
     magicLink: boolean;
     /** Whether to offer a passkey. */
     passkey: boolean;
@@ -592,21 +597,34 @@ interface AuthClient {
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
         }>>;
-        /** With address and password. `mfa_required`: ask for the code and call `signIn.mfa`. */
+        /**
+         * With address and password. `mfa_required`: ask for the code and call
+         * `signIn.mfa`. `method: 'email'` says the code was just mailed to the
+         * account's address (it has no factor of its own and the workspace, or
+         * the sign-in's risk, asked a second step): say so, and offer
+         * `mfaSendEmail` for another.
+         */
         email(form: {
             email: string;
             password: string;
             captchaToken?: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
-        }> | AuthResult<'mfa_required'>>;
-        /** The second step: the code of the authenticator app, or a recovery code. */
+        }> | AuthResult<'mfa_required', {
+            method?: 'email';
+        }>>;
+        /** The second step: the code of the authenticator app, the phone, the email, or a recovery code. */
         mfa(form: {
             code: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
         }>>;
-        /** While the second step is asked for: whether the account has an authenticator app, the phone (masked) a code can be sent to, and phones that approve sign-ins. */
+        /**
+         * While the second step is asked for: whether the account has an
+         * authenticator app, the phone (masked) a code can be sent to, phones
+         * that approve sign-ins, and the address (masked) a code went to when
+         * the step is by email.
+         */
         mfaMethods(): Promise<AuthResult<'ok', {
             totp: boolean;
             phone: {
@@ -616,6 +634,13 @@ interface AuthClient {
             push: {
                 devices: number;
             } | null;
+            email: {
+                to: string;
+            } | null;
+        }>>;
+        /** Mails the sign-in's code again, when its second step is by email; `mfa` takes it. A few per sign-in. */
+        mfaSendEmail(): Promise<AuthResult<'sent', {
+            sentTo: string;
         }>>;
         /**
          * Sends a push to the account's phones (the application's app, with
@@ -764,6 +789,7 @@ interface AuthClient {
             email: string;
             password: string;
             name?: string;
+            organization?: string;
             captchaToken?: string;
         }): Promise<AuthResult<'signed_in', {
             session: PublicSession;
@@ -782,9 +808,12 @@ interface AuthClient {
         password: string;
     }): Promise<AuthResult<'changed'>>;
     /** Confirms the address, with the token the mailed link opened the page with (`token`). */
+    /** Confirms the address a mailed link is for. The person is signed in from the link when their account asks no second step. */
     verifyEmail(form: {
         token: string;
-    }): Promise<AuthResult<'verified'>>;
+    }): Promise<AuthResult<'verified'> | AuthResult<'signed_in', {
+        session: PublicSession;
+    }>>;
     signOut(): Promise<AuthResult<'signed_out'>>;
     /** The signed-in person's own account. */
     account: AccountClient;
@@ -826,12 +855,17 @@ interface AuthTexts {
     forgotPassword: string;
     noAccount: string;
     createAccount: string;
+    /** The label of the company's name, asked when the application's system makes an organization per sign-up. */
+    company: string;
     haveAccount: string;
     sendLink: string;
     linkSent: string;
     codeHelp: string;
     /** The second step when it is a phone only. */
     codeHelpPhone: string;
+    /** The second step by email (the account has no factor): "{to}" is the address, masked. */
+    codeHelpEmail: string;
+    sendEmailAgain: string;
     /** "{to}" is the phone, masked. */
     sendCodeSms: string;
     sendCodeWhatsapp: string;

package/dist/react.js

@@ -211,6 +211,13 @@ function checkName(value) {
   if (typeof value !== "string" || value.trim().length > MAX_NAME) return { field: "name", code: "too_long", message: `Use at most ${MAX_NAME} characters.` };
   return null;
 }
+var MAX_ORGANIZATION = 120;
+function checkOrganization(value, required = false) {
+  const v = typeof value === "string" ? value.trim() : "";
+  if (v === "") return required ? { field: "organization", code: "required", message: "Enter your company's name." } : null;
+  if (v.length > MAX_ORGANIZATION) return { field: "organization", code: "too_long", message: `Use at most ${MAX_ORGANIZATION} characters.` };
+  return null;
+}
 function checkCode(value) {
   const v = typeof value === "string" ? value.trim() : "";
   if (v === "") return { field: "code", code: "required", message: "Enter the code." };
@@ -317,6 +324,7 @@ function createAuthClient(options = {}) {
       mfa: (f) => post("/sign-in/mfa", { code: f.code }, checkCode(f.code)),
       mfaMethods: () => post("/sign-in/mfa/methods", {}, null),
       mfaSendCode: () => post("/sign-in/mfa/send", {}, null),
+      mfaSendEmail: () => post("/sign-in/mfa/email", {}, null),
       mfaPush: () => post("/sign-in/mfa/push", {}, null),
       async mfaPushWait(o = {}) {
         const status = await new Promise((resolve) => {
@@ -433,7 +441,12 @@ function createAuthClient(options = {}) {
       }
     },
     signUp: {
-      email: (f) => post("/sign-up/email", { email: f.email, password: f.password, name: f.name }, firstProblem(checkName(f.name), checkEmail(f.email), checkNewPassword(f.password)), f.captchaToken)
+      email: (f) => post(
+        "/sign-up/email",
+        { email: f.email, password: f.password, name: f.name, organization: f.organization },
+        firstProblem(checkName(f.name), checkEmail(f.email), checkNewPassword(f.password), checkOrganization(f.organization)),
+        f.captchaToken
+      )
     },
     forgotPassword: (f) => post("/forgot-password", { email: f.email }, checkEmail(f.email), f.captchaToken),
     resetPassword: (f) => post("/reset-password", { token: f.token, password: f.password }, checkNewPassword(f.password)),
@@ -593,6 +606,7 @@ var TEXTS = {
     email: "Email",
     password: "Password",
     name: "Name",
+    company: "Your company's name",
     code: "Code",
     signIn: "Sign in",
     signUp: "Create account",
@@ -607,6 +621,8 @@ var TEXTS = {
     codeHelp: "Enter the code from your authenticator app, or a recovery code.",
     verify: "Verify",
     codeHelpPhone: "We send a code to your phone. Ask for it, then type it here, or use a recovery code.",
+    codeHelpEmail: "We sent a code to {to}. Type it here.",
+    sendEmailAgain: "Send the code again",
     sendCodeSms: "Send a code by SMS to {to}",
     sendCodeWhatsapp: "Send a code by WhatsApp to {to}",
     codeSent: "We sent a code to {to}. Type it here.",
@@ -621,7 +637,7 @@ var TEXTS = {
     removePhone: "Remove phone",
     bySms: "SMS",
     byWhatsapp: "WhatsApp",
-    checkEmail: "Almost there: open the link we sent to confirm your address, then sign in.",
+    checkEmail: "Almost there: open the link we sent to confirm your address \u2014 it signs you in.",
     backToSignIn: "Back to sign in",
     emailMeALink: "Email me a sign-in link",
     usePasskey: "Sign in with a passkey",
@@ -742,6 +758,7 @@ var TEXTS = {
     email: "Correo",
     password: "Contrase\xF1a",
     name: "Nombre",
+    company: "Nombre de tu empresa",
     code: "C\xF3digo",
     signIn: "Entrar",
     signUp: "Crear cuenta",
@@ -756,6 +773,8 @@ var TEXTS = {
     codeHelp: "Escribe el c\xF3digo de tu aplicaci\xF3n de autenticaci\xF3n, o un c\xF3digo de recuperaci\xF3n.",
     verify: "Verificar",
     codeHelpPhone: "Te enviamos un c\xF3digo a tu tel\xE9fono. P\xEDdelo y escr\xEDbelo aqu\xED, o usa un c\xF3digo de recuperaci\xF3n.",
+    codeHelpEmail: "Te enviamos un c\xF3digo a {to}. Escr\xEDbelo aqu\xED.",
+    sendEmailAgain: "Enviar el c\xF3digo de nuevo",
     sendCodeSms: "Enviar un c\xF3digo por SMS a {to}",
     sendCodeWhatsapp: "Enviar un c\xF3digo por WhatsApp a {to}",
     codeSent: "Te enviamos un c\xF3digo a {to}. Escr\xEDbelo aqu\xED.",
@@ -770,7 +789,7 @@ var TEXTS = {
     removePhone: "Quitar tel\xE9fono",
     bySms: "SMS",
     byWhatsapp: "WhatsApp",
-    checkEmail: "Ya casi: abre el enlace que te enviamos para confirmar tu correo y luego entra.",
+    checkEmail: "Casi listo: abre el enlace que te enviamos para confirmar tu correo; te deja adentro.",
     backToSignIn: "Volver a entrar",
     emailMeALink: "Env\xEDame un enlace para entrar",
     usePasskey: "Entrar con una llave de acceso",
@@ -1074,9 +1093,17 @@ function SignIn(props) {
   (0, import_react.useEffect)(() => {
     if (step !== "code") return;
     void auth.signIn.mfaMethods().then((r) => {
-      if (r.ok) setPhoneWay({ totp: r.totp, phone: r.phone, push: r.push });
+      if (r.ok) setPhoneWay({ totp: r.totp, phone: r.phone, push: r.push, email: r.email });
     });
   }, [step]);
+  const sendEmail = async () => {
+    f.setBusy(true);
+    f.setError(null);
+    const r = await auth.signIn.mfaSendEmail();
+    f.setBusy(false);
+    if (!r.ok) return f.setError(r.error);
+    setPhoneSent(r.sentTo);
+  };
   const [pushNumber, setPushNumber] = (0, import_react.useState)(0);
   const pushWait = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => () => pushWait.current?.abort(), []);
@@ -1205,8 +1232,9 @@ function SignIn(props) {
   if (step === "code") {
     const to = phoneWay?.phone?.number ?? "";
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", { className: f.cx("form"), ...f.root, onSubmit: submit, noValidate: true, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: f.cx("notice"), children: phoneSent ? f.t.codeSent.replace("{to}", phoneSent) : phoneWay?.phone && !phoneWay.totp ? f.t.codeHelpPhone : f.t.codeHelp }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: f.cx("notice"), children: phoneSent ? f.t.codeSent.replace("{to}", phoneSent) : phoneWay?.email ? f.t.codeHelpEmail.replace("{to}", phoneWay.email.to) : phoneWay?.phone && !phoneWay.totp ? f.t.codeHelpPhone : f.t.codeHelp }),
       general && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { role: "alert", className: f.cx("error"), children: f.say(general) }),
+      phoneWay?.email && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(f.Button, { type: "button", disabled: f.busy, className: f.cx("providerButton"), onClick: () => void sendEmail(), children: f.t.sendEmailAgain }),
       pushNumber > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: f.cx("notice"), role: "status", "aria-live": "polite", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: f.t.pushPick.replace("{n}", String(pushNumber)) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: { fontSize: 48, fontWeight: 700, margin: "4px 0", textAlign: "center" }, children: pushNumber }),
@@ -1281,15 +1309,17 @@ function SignUp(props) {
   const auth = useAuth();
   const f = useForm(props);
   const [name, setName] = (0, import_react.useState)("");
+  const [organization, setOrganization] = (0, import_react.useState)("");
   const [email, setEmail] = (0, import_react.useState)("");
   const [password, setPassword] = (0, import_react.useState)("");
   const [sent, setSent] = (0, import_react.useState)(false);
-  const challenge = useChallenge(useMethods(auth)?.captchaSiteKey, props.locale);
+  const methods = useMethods(auth);
+  const challenge = useChallenge(methods?.captchaSiteKey, props.locale);
   const submit = async (e) => {
     e.preventDefault();
     f.setBusy(true);
     f.setError(null);
-    const r = auth.session?.user.isAnonymous === true ? await auth.account.upgrade({ name, email, password }) : await auth.signUp.email({ name, email, password, captchaToken: challenge.token });
+    const r = auth.session?.user.isAnonymous === true ? await auth.account.upgrade({ name, email, password }) : await auth.signUp.email({ name, email, password, ...methods?.organization?.ask ? { organization } : {}, captchaToken: challenge.token });
     f.setBusy(false);
     challenge.renew();
     if (!r.ok) return f.setError(r.error);
@@ -1305,6 +1335,7 @@ function SignUp(props) {
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", { className: f.cx("form"), ...f.root, onSubmit: submit, noValidate: true, children: [
     general && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { role: "alert", className: f.cx("error"), children: f.say(general) }),
+    methods?.organization?.ask && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { f, name: "organization", type: "text", label: f.t.company, value: organization, autoComplete: "organization", required: methods.organization.required, onChange: setOrganization }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { f, name: "name", type: "text", label: f.t.name, value: name, autoComplete: "name", onChange: setName }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { f, name: "email", type: "email", label: f.t.email, value: email, autoComplete: "username", required: true, onChange: setEmail }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { f, name: "password", type: "password", label: f.t.password, value: password, autoComplete: "new-password", required: true, onChange: setPassword }),
@@ -1397,6 +1428,7 @@ function VerifyEmail(props) {
       return setState("failed");
     }
     void auth.verifyEmail({ token }).then((r) => {
+      if (r.ok && r.status === "signed_in") return f.done();
       if (r.ok) return setState("confirmed");
       f.setError(r.error);
       setState("failed");