@contember/react-client-tenant 2.2.0-alpha.3 → 2.2.0-alpha.6

package/dist/development/src/components/forms/CreateGlobalApiKeyForm.js

@@ -0,0 +1,53 @@
+import { jsxDEV } from "react/jsx-dev-runtime";
+import { TenantForm } from "./TenantForm.js";
+import { useForm } from "../../contexts.js";
+import { useCreateGlobalApiKeyMutation } from "../../hooks/mutations/apiKey/useCreateGlobalApiKeyMutation.js";
+const useCreateGlobalApiKeyForm = useForm;
+const CreateGlobalApiKeyForm = ({ children, onSuccess, initialRoles }) => {
+  const createGlobalApiKey = useCreateGlobalApiKeyMutation();
+  return /* @__PURE__ */ jsxDEV(
+    TenantForm,
+    {
+      onSuccess,
+      initialValues: {
+        description: "",
+        roles: initialRoles || []
+      },
+      validate: ({ values }) => {
+        const errors = [];
+        if (!values.description) {
+          errors.push({ code: "FIELD_REQUIRED", field: "description" });
+        }
+        return errors;
+      },
+      execute: async ({ values }) => {
+        return await createGlobalApiKey({
+          description: values.description,
+          roles: values.roles
+        });
+      },
+      errorMapping: errorToField,
+      children
+    },
+    void 0,
+    false,
+    {
+      fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/CreateGlobalApiKeyForm.tsx",
+      lineNumber: 35,
+      columnNumber: 3
+    },
+    void 0
+  );
+};
+const errorToField = {
+  INVALID_MEMBERSHIP: void 0,
+  PROJECT_NOT_FOUND: void 0,
+  ROLE_NOT_FOUND: "roles",
+  VARIABLE_EMPTY: void 0,
+  VARIABLE_NOT_FOUND: void 0
+};
+export {
+  CreateGlobalApiKeyForm,
+  useCreateGlobalApiKeyForm
+};
+//# sourceMappingURL=CreateGlobalApiKeyForm.js.map

package/dist/development/src/components/forms/CreateGlobalApiKeyForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateGlobalApiKeyForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/CreateGlobalApiKeyForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { CreateApiKeyErrorCode } from '@contember/graphql-client-tenant'\nimport { CreateGlobalApiKeyMutationResult, useCreateGlobalApiKeyMutation } from '../../hooks/index.js'\n\nexport type CreateGlobalApiKeyFormValues = {\n\tdescription: string\n\troles: readonly string[]\n}\n\nexport type CreateGlobalApiKeyFormErrorCode =\n\t| CreateApiKeyErrorCode\n\t| 'UNKNOWN_ERROR'\n\t| 'FIELD_REQUIRED'\n\nexport type CreateGlobalApiKeyFormState = FormState\n\nexport type CreateGlobalApiKeyFormError = FormError<CreateGlobalApiKeyFormValues, CreateGlobalApiKeyFormErrorCode>\n\nexport type CreateGlobalApiKeyFormContextValue = FormContextValue<CreateGlobalApiKeyFormValues, CreateGlobalApiKeyFormErrorCode>\n\nexport interface CreateGlobalApiKeyFormProps {\n\tchildren: ReactElement\n\tinitialRoles?: readonly string[]\n\tonSuccess?: (args: { result: CreateGlobalApiKeyMutationResult }) => void\n}\n\nexport const useCreateGlobalApiKeyForm = useForm as () => CreateGlobalApiKeyFormContextValue\n\nexport const CreateGlobalApiKeyForm = ({ children, onSuccess, initialRoles }: CreateGlobalApiKeyFormProps) => {\n\tconst createGlobalApiKey = useCreateGlobalApiKeyMutation()\n\treturn (\n\t\t<TenantForm<CreateGlobalApiKeyFormContextValue, CreateGlobalApiKeyMutationResult>\n\t\t\tonSuccess={onSuccess}\n\t\t\tinitialValues={{\n\t\t\t\tdescription: '',\n\t\t\t\troles: initialRoles || [],\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tconst errors: CreateGlobalApiKeyFormError[] = []\n\t\t\t\tif (!values.description) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'description' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\treturn await createGlobalApiKey({\n\t\t\t\t\tdescription: values.description,\n\t\t\t\t\troles: values.roles,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n\nconst errorToField: Record<CreateApiKeyErrorCode, keyof CreateGlobalApiKeyFormValues | undefined> = {\n\tINVALID_MEMBERSHIP: undefined,\n\tPROJECT_NOT_FOUND: undefined,\n\tROLE_NOT_FOUND: 'roles',\n\tVARIABLE_EMPTY: undefined,\n\tVARIABLE_NOT_FOUND: undefined,\n}\n"],"names":["this"],"mappings":";;;;AA6BO,MAAM,4BAA4B;AAElC,MAAM,yBAAyB,CAAC,EAAE,UAAU,WAAW,mBAAgD;AAC7G,QAAM,qBAAqB,8BAAA;AAC3B,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,QACd,aAAa;AAAA,QACb,OAAO,gBAAgB,CAAA;AAAA,MAAC;AAAA,MAEzB,UAAU,CAAC,EAAE,aAAa;AACzB,cAAM,SAAwC,CAAA;AAC9C,YAAI,CAAC,OAAO,aAAa;AACxB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,eAAe;AAAA,QAC7D;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,eAAO,MAAM,mBAAmB;AAAA,UAC/B,aAAa,OAAO;AAAA,UACpB,OAAO,OAAO;AAAA,QAAA,CACd;AAAA,MACF;AAAA,MACA,cAAc;AAAA,MAEb;AAAA,IAAA;AAAA,IArBF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AAwBF;AAEA,MAAM,eAA8F;AAAA,EACnG,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,gBAAgB;AAAA,EAChB,oBAAoB;AACrB;"}

package/dist/development/src/components/forms/EmailOtpConfirmForm.cjs

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const jsxDevRuntime = require("react/jsx-dev-runtime");
+const TenantForm = require("./TenantForm.cjs");
+const contexts = require("../../contexts.cjs");
+const useConfirmEmailOtpMutation = require("../../hooks/mutations/emailOtp/useConfirmEmailOtpMutation.cjs");
+const useEmailOtpConfirmForm = contexts.useForm;
+const EmailOtpConfirmForm = ({ children, onSuccess }) => {
+  const confirmEmailOtp = useConfirmEmailOtpMutation.useConfirmEmailOtpMutation();
+  const { refreshIdentity } = contexts.useIdentityMethods();
+  return /* @__PURE__ */ jsxDevRuntime.jsxDEV(
+    TenantForm.TenantForm,
+    {
+      onSuccess: async (args) => {
+        await refreshIdentity();
+        onSuccess?.(args);
+      },
+      initialValues: {
+        otpToken: ""
+      },
+      validate: ({ values }) => {
+        if (!values.otpToken) {
+          return [{ code: "FIELD_REQUIRED", field: "otpToken" }];
+        }
+        if (!values.otpToken.match(/^\d{6}$/)) {
+          return [{ code: "INVALID_VALUE", field: "otpToken" }];
+        }
+      },
+      execute: async ({ values }) => {
+        return await confirmEmailOtp({
+          otpToken: values.otpToken
+        });
+      },
+      errorMapping: {
+        INVALID_OTP_TOKEN: "otpToken"
+      },
+      children
+    },
+    void 0,
+    false,
+    {
+      fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/EmailOtpConfirmForm.tsx",
+      lineNumber: 36,
+      columnNumber: 3
+    },
+    void 0
+  );
+};
+exports.EmailOtpConfirmForm = EmailOtpConfirmForm;
+exports.useEmailOtpConfirmForm = useEmailOtpConfirmForm;
+//# sourceMappingURL=EmailOtpConfirmForm.cjs.map

package/dist/development/src/components/forms/EmailOtpConfirmForm.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailOtpConfirmForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/EmailOtpConfirmForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { ConfirmEmailOtpErrorCode } from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm, useIdentityMethods } from '../../contexts.js'\nimport { ConfirmEmailOtpMutationResult, useConfirmEmailOtpMutation } from '../../hooks/index.js'\n\nexport type EmailOtpConfirmFormValues = {\n\totpToken: string\n}\n\nexport type EmailOtpConfirmFormErrorCode =\n\t| ConfirmEmailOtpErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type EmailOtpConfirmFormState = FormState\n\nexport type EmailOtpConfirmFormError = FormError<EmailOtpConfirmFormValues, EmailOtpConfirmFormErrorCode>\n\nexport type EmailOtpConfirmFormContextValue = FormContextValue<EmailOtpConfirmFormValues, EmailOtpConfirmFormErrorCode>\n\nexport interface EmailOtpConfirmFormProps {\n\tchildren: ReactElement\n\t/** The result carries freshly issued backup codes — show them once, they are not retrievable later. */\n\tonSuccess?: (args: { result: ConfirmEmailOtpMutationResult }) => void\n}\n\nexport const useEmailOtpConfirmForm = useForm as () => EmailOtpConfirmFormContextValue\n\nexport const EmailOtpConfirmForm = ({ children, onSuccess }: EmailOtpConfirmFormProps) => {\n\tconst confirmEmailOtp = useConfirmEmailOtpMutation()\n\tconst { refreshIdentity } = useIdentityMethods()\n\treturn (\n\t\t<TenantForm<EmailOtpConfirmFormContextValue, ConfirmEmailOtpMutationResult>\n\t\t\tonSuccess={async args => {\n\t\t\t\tawait refreshIdentity()\n\t\t\t\tonSuccess?.(args)\n\t\t\t}}\n\t\t\tinitialValues={{\n\t\t\t\totpToken: '',\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tif (!values.otpToken) {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t\tif (!values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\treturn [{ code: 'INVALID_VALUE', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\treturn await confirmEmailOtp({\n\t\t\t\t\totpToken: values.otpToken,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={{\n\t\t\t\tINVALID_OTP_TOKEN: 'otpToken',\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n"],"names":["useForm","useConfirmEmailOtpMutation","useIdentityMethods","jsxDEV","TenantForm","this"],"mappings":";;;;;;AA6BO,MAAM,yBAAyBA,SAAAA;AAE/B,MAAM,sBAAsB,CAAC,EAAE,UAAU,gBAA0C;AACzF,QAAM,kBAAkBC,2BAAAA,2BAAA;AACxB,QAAM,EAAE,gBAAA,IAAoBC,4BAAA;AAC5B,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA,WAAW,OAAM,SAAQ;AACxB,cAAM,gBAAA;AACN,oBAAY,IAAI;AAAA,MACjB;AAAA,MACA,eAAe;AAAA,QACd,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,aAAa;AACzB,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QACtD;AACA,YAAI,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AACtC,iBAAO,CAAC,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACrD;AAAA,MACD;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,eAAO,MAAM,gBAAgB;AAAA,UAC5B,UAAU,OAAO;AAAA,QAAA,CACjB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,QACb,mBAAmB;AAAA,MAAA;AAAA,MAGnB;AAAA,IAAA;AAAA,IAzBF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AA4BF;;;"}

package/dist/development/src/components/forms/EmailOtpConfirmForm.js

@@ -0,0 +1,51 @@
+import { jsxDEV } from "react/jsx-dev-runtime";
+import { TenantForm } from "./TenantForm.js";
+import { useForm, useIdentityMethods } from "../../contexts.js";
+import { useConfirmEmailOtpMutation } from "../../hooks/mutations/emailOtp/useConfirmEmailOtpMutation.js";
+const useEmailOtpConfirmForm = useForm;
+const EmailOtpConfirmForm = ({ children, onSuccess }) => {
+  const confirmEmailOtp = useConfirmEmailOtpMutation();
+  const { refreshIdentity } = useIdentityMethods();
+  return /* @__PURE__ */ jsxDEV(
+    TenantForm,
+    {
+      onSuccess: async (args) => {
+        await refreshIdentity();
+        onSuccess?.(args);
+      },
+      initialValues: {
+        otpToken: ""
+      },
+      validate: ({ values }) => {
+        if (!values.otpToken) {
+          return [{ code: "FIELD_REQUIRED", field: "otpToken" }];
+        }
+        if (!values.otpToken.match(/^\d{6}$/)) {
+          return [{ code: "INVALID_VALUE", field: "otpToken" }];
+        }
+      },
+      execute: async ({ values }) => {
+        return await confirmEmailOtp({
+          otpToken: values.otpToken
+        });
+      },
+      errorMapping: {
+        INVALID_OTP_TOKEN: "otpToken"
+      },
+      children
+    },
+    void 0,
+    false,
+    {
+      fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/EmailOtpConfirmForm.tsx",
+      lineNumber: 36,
+      columnNumber: 3
+    },
+    void 0
+  );
+};
+export {
+  EmailOtpConfirmForm,
+  useEmailOtpConfirmForm
+};
+//# sourceMappingURL=EmailOtpConfirmForm.js.map

package/dist/development/src/components/forms/EmailOtpConfirmForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailOtpConfirmForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/EmailOtpConfirmForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { ConfirmEmailOtpErrorCode } from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm, useIdentityMethods } from '../../contexts.js'\nimport { ConfirmEmailOtpMutationResult, useConfirmEmailOtpMutation } from '../../hooks/index.js'\n\nexport type EmailOtpConfirmFormValues = {\n\totpToken: string\n}\n\nexport type EmailOtpConfirmFormErrorCode =\n\t| ConfirmEmailOtpErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type EmailOtpConfirmFormState = FormState\n\nexport type EmailOtpConfirmFormError = FormError<EmailOtpConfirmFormValues, EmailOtpConfirmFormErrorCode>\n\nexport type EmailOtpConfirmFormContextValue = FormContextValue<EmailOtpConfirmFormValues, EmailOtpConfirmFormErrorCode>\n\nexport interface EmailOtpConfirmFormProps {\n\tchildren: ReactElement\n\t/** The result carries freshly issued backup codes — show them once, they are not retrievable later. */\n\tonSuccess?: (args: { result: ConfirmEmailOtpMutationResult }) => void\n}\n\nexport const useEmailOtpConfirmForm = useForm as () => EmailOtpConfirmFormContextValue\n\nexport const EmailOtpConfirmForm = ({ children, onSuccess }: EmailOtpConfirmFormProps) => {\n\tconst confirmEmailOtp = useConfirmEmailOtpMutation()\n\tconst { refreshIdentity } = useIdentityMethods()\n\treturn (\n\t\t<TenantForm<EmailOtpConfirmFormContextValue, ConfirmEmailOtpMutationResult>\n\t\t\tonSuccess={async args => {\n\t\t\t\tawait refreshIdentity()\n\t\t\t\tonSuccess?.(args)\n\t\t\t}}\n\t\t\tinitialValues={{\n\t\t\t\totpToken: '',\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tif (!values.otpToken) {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t\tif (!values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\treturn [{ code: 'INVALID_VALUE', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\treturn await confirmEmailOtp({\n\t\t\t\t\totpToken: values.otpToken,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={{\n\t\t\t\tINVALID_OTP_TOKEN: 'otpToken',\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n"],"names":["this"],"mappings":";;;;AA6BO,MAAM,yBAAyB;AAE/B,MAAM,sBAAsB,CAAC,EAAE,UAAU,gBAA0C;AACzF,QAAM,kBAAkB,2BAAA;AACxB,QAAM,EAAE,gBAAA,IAAoB,mBAAA;AAC5B,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA,WAAW,OAAM,SAAQ;AACxB,cAAM,gBAAA;AACN,oBAAY,IAAI;AAAA,MACjB;AAAA,MACA,eAAe;AAAA,QACd,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,aAAa;AACzB,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QACtD;AACA,YAAI,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AACtC,iBAAO,CAAC,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACrD;AAAA,MACD;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,eAAO,MAAM,gBAAgB;AAAA,UAC5B,UAAU,OAAO;AAAA,QAAA,CACjB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,QACb,mBAAmB;AAAA,MAAA;AAAA,MAGnB;AAAA,IAAA;AAAA,IAzBF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AA4BF;"}

package/dist/development/src/components/forms/InviteForm.cjs

@@ -4,9 +4,11 @@ const jsxDevRuntime = require("react/jsx-dev-runtime");
 const TenantForm = require("./TenantForm.cjs");
 const contexts = require("../../contexts.cjs");
 const useInviteMutation = require("../../hooks/mutations/invite/useInviteMutation.cjs");
+const useUnmanagedInviteMutation = require("../../hooks/mutations/invite/useUnmanagedInviteMutation.cjs");
 const useInviteForm = contexts.useForm;
-const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions }) => {
+const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions, allowUnmanaged }) => {
   const invite = useInviteMutation.useInviteMutation();
+  const unmanagedInvite = useUnmanagedInviteMutation.useUnmanagedInviteMutation();
   return /* @__PURE__ */ jsxDevRuntime.jsxDEV(
     TenantForm.TenantForm,
     {
@@ -14,7 +16,9 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
       initialValues: {
         email: "",
         name: "",
-        memberships: initialMemberships || []
+        memberships: initialMemberships || [],
+        unmanaged: false,
+        password: ""
       },
       validate: ({ values }) => {
         const errors = [];
@@ -27,6 +31,22 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
         return errors;
       },
       execute: async ({ values }) => {
+        if (values.unmanaged && !allowUnmanaged) {
+          throw new Error(
+            "InviteForm: values.unmanaged is set but the form was not given allowUnmanaged. Pass it to both InviteForm and InviteFormFields."
+          );
+        }
+        if (values.unmanaged) {
+          return await unmanagedInvite({
+            email: values.email,
+            name: values.name,
+            projectSlug,
+            memberships: values.memberships,
+            // An empty password creates the account without one — the person then
+            // has to go through a password reset, which is a legitimate setup.
+            options: values.password ? { password: values.password } : void 0
+          });
+        }
         return await invite({
           email: values.email,
           name: values.name,
@@ -42,7 +62,7 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/InviteForm.tsx",
-      lineNumber: 38,
+      lineNumber: 52,
       columnNumber: 3
     },
     void 0

package/dist/development/src/components/forms/InviteForm.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"InviteForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/InviteForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { InviteErrorCode, InviteOptions, MembershipInput } from '@contember/graphql-client-tenant'\nimport { InviteMutationResult, useInviteMutation } from '../../hooks/index.js'\n\nexport type InviteFormValues = {\n\temail: string\n\tname: string\n\tmemberships: readonly MembershipInput[]\n}\n\nexport type InviteFormErrorCode =\n\t| InviteErrorCode\n\t| 'UNKNOWN_ERROR'\n\t| 'FIELD_REQUIRED'\n\nexport type InviteFormState = FormState\n\nexport type InviteFormError = FormError<InviteFormValues, InviteFormErrorCode>\n\nexport type InviteFormContextValue = FormContextValue<InviteFormValues, InviteFormErrorCode>\n\nexport interface InviteFormProps {\n\tchildren: ReactElement\n\tprojectSlug: string\n\tinviteOptions?: InviteOptions\n\tinitialMemberships?: readonly MembershipInput[]\n\tonSuccess?: (args: { result: InviteMutationResult }) => void\n}\n\nexport const useInviteForm = useForm as () => InviteFormContextValue\n\nexport const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions }: InviteFormProps) => {\n\tconst invite = useInviteMutation()\n\treturn (\n\t\t<TenantForm<InviteFormContextValue, InviteMutationResult>\n\t\t\tonSuccess={onSuccess}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tname: '',\n\t\t\t\tmemberships: initialMemberships || [],\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tconst errors: InviteFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t}\n\t\t\t\tif (values.memberships.length === 0) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'memberships' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\treturn await invite({\n\t\t\t\t\temail: values.email,\n\t\t\t\t\tname: values.name,\n\t\t\t\t\tprojectSlug,\n\t\t\t\t\toptions: inviteOptions,\n\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n\nconst errorToField: Record<InviteErrorCode, keyof InviteFormValues | undefined> = {\n\tALREADY_MEMBER: 'email',\n\tINVALID_EMAIL_FORMAT: 'email',\n\tINVALID_MEMBERSHIP: 'memberships',\n\tPROJECT_NOT_FOUND: undefined,\n\tROLE_NOT_FOUND: 'memberships',\n\tVARIABLE_EMPTY: 'memberships',\n\tVARIABLE_NOT_FOUND: 'memberships',\n}\n"],"names":["useForm","useInviteMutation","jsxDEV","TenantForm","this"],"mappings":";;;;;;AAgCO,MAAM,gBAAgBA,SAAAA;AAEtB,MAAM,aAAa,CAAC,EAAE,UAAU,WAAW,aAAa,oBAAoB,oBAAqC;AACvH,QAAM,SAASC,kBAAAA,kBAAA;AACf,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,QACN,aAAa,sBAAsB,CAAA;AAAA,MAAC;AAAA,MAErC,UAAU,CAAC,EAAE,aAAa;AACzB,cAAM,SAA4B,CAAA;AAClC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD;AACA,YAAI,OAAO,YAAY,WAAW,GAAG;AACpC,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,eAAe;AAAA,QAC7D;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,eAAO,MAAM,OAAO;AAAA,UACnB,OAAO,OAAO;AAAA,UACd,MAAM,OAAO;AAAA,UACb;AAAA,UACA,SAAS;AAAA,UACT,aAAa,OAAO;AAAA,QAAA,CACpB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,MAEb;AAAA,IAAA;AAAA,IA5BF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AA+BF;AAEA,MAAM,eAA4E;AAAA,EACjF,gBAAgB;AAAA,EAChB,sBAAsB;AAAA,EACtB,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,gBAAgB;AAAA,EAChB,oBAAoB;AACrB;;;"}
+{"version":3,"file":"InviteForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/InviteForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { InviteErrorCode, InviteOptions, MembershipInput } from '@contember/graphql-client-tenant'\nimport { InviteMutationResult, useInviteMutation, useUnmanagedInviteMutation } from '../../hooks/index.js'\n\nexport type InviteFormValues = {\n\temail: string\n\tname: string\n\tmemberships: readonly MembershipInput[]\n\t/** Switches to `unmanagedInvite`: create the member without sending mail. Requires `allowUnmanaged` on the form. */\n\tunmanaged: boolean\n\t/** Only read when `unmanaged` is set; empty means the account is created without a password. */\n\tpassword: string\n}\n\nexport type InviteFormErrorCode =\n\t| InviteErrorCode\n\t| 'UNKNOWN_ERROR'\n\t| 'FIELD_REQUIRED'\n\nexport type InviteFormState = FormState\n\nexport type InviteFormError = FormError<InviteFormValues, InviteFormErrorCode>\n\nexport type InviteFormContextValue = FormContextValue<InviteFormValues, InviteFormErrorCode>\n\nexport interface InviteFormProps {\n\tchildren: ReactElement\n\tprojectSlug: string\n\tinviteOptions?: InviteOptions\n\tinitialMemberships?: readonly MembershipInput[]\n\t/**\n\t * Lets the form submit through `unmanagedInvite` when `values.unmanaged` is\n\t * set — no invitation e-mail, optionally with a password. Off by default, so\n\t * a host app has to opt into offering it. Submitting with `values.unmanaged`\n\t * set but this off throws rather than falling back to a mailed invitation.\n\t */\n\tallowUnmanaged?: boolean\n\tonSuccess?: (args: { result: InviteMutationResult }) => void\n}\n\nexport const useInviteForm = useForm as () => InviteFormContextValue\n\nexport const InviteForm = (\n\t{ children, onSuccess, projectSlug, initialMemberships, inviteOptions, allowUnmanaged }: InviteFormProps,\n) => {\n\tconst invite = useInviteMutation()\n\tconst unmanagedInvite = useUnmanagedInviteMutation()\n\treturn (\n\t\t<TenantForm<InviteFormContextValue, InviteMutationResult>\n\t\t\tonSuccess={onSuccess}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tname: '',\n\t\t\t\tmemberships: initialMemberships || [],\n\t\t\t\tunmanaged: false,\n\t\t\t\tpassword: '',\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tconst errors: InviteFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t}\n\t\t\t\tif (values.memberships.length === 0) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'memberships' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tif (values.unmanaged && !allowUnmanaged) {\n\t\t\t\t\t// `InviteFormFields` takes its own `allowUnmanaged`, so the two can drift.\n\t\t\t\t\t// Failing beats quietly mailing someone who asked for no mail.\n\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t'InviteForm: values.unmanaged is set but the form was not given allowUnmanaged. Pass it to both InviteForm and InviteFormFields.',\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\tif (values.unmanaged) {\n\t\t\t\t\treturn await unmanagedInvite({\n\t\t\t\t\t\temail: values.email,\n\t\t\t\t\t\tname: values.name,\n\t\t\t\t\t\tprojectSlug,\n\t\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t\t\t// An empty password creates the account without one — the person then\n\t\t\t\t\t\t// has to go through a password reset, which is a legitimate setup.\n\t\t\t\t\t\toptions: values.password ? { password: values.password } : undefined,\n\t\t\t\t\t})\n\t\t\t\t}\n\t\t\t\treturn await invite({\n\t\t\t\t\temail: values.email,\n\t\t\t\t\tname: values.name,\n\t\t\t\t\tprojectSlug,\n\t\t\t\t\toptions: inviteOptions,\n\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n\nconst errorToField: Record<InviteErrorCode, keyof InviteFormValues | undefined> = {\n\tALREADY_MEMBER: 'email',\n\tINVALID_EMAIL_FORMAT: 'email',\n\tINVALID_MEMBERSHIP: 'memberships',\n\tPROJECT_NOT_FOUND: undefined,\n\tROLE_NOT_FOUND: 'memberships',\n\tVARIABLE_EMPTY: 'memberships',\n\tVARIABLE_NOT_FOUND: 'memberships',\n}\n"],"names":["useForm","useInviteMutation","useUnmanagedInviteMutation","jsxDEV","TenantForm","this"],"mappings":";;;;;;;AA2CO,MAAM,gBAAgBA,SAAAA;AAEtB,MAAM,aAAa,CACzB,EAAE,UAAU,WAAW,aAAa,oBAAoB,eAAe,qBACnE;AACJ,QAAM,SAASC,kBAAAA,kBAAA;AACf,QAAM,kBAAkBC,2BAAAA,2BAAA;AACxB,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,QACN,aAAa,sBAAsB,CAAA;AAAA,QACnC,WAAW;AAAA,QACX,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,aAAa;AACzB,cAAM,SAA4B,CAAA;AAClC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD;AACA,YAAI,OAAO,YAAY,WAAW,GAAG;AACpC,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,eAAe;AAAA,QAC7D;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,YAAI,OAAO,aAAa,CAAC,gBAAgB;AAGxC,gBAAM,IAAI;AAAA,YACT;AAAA,UAAA;AAAA,QAEF;AACA,YAAI,OAAO,WAAW;AACrB,iBAAO,MAAM,gBAAgB;AAAA,YAC5B,OAAO,OAAO;AAAA,YACd,MAAM,OAAO;AAAA,YACb;AAAA,YACA,aAAa,OAAO;AAAA;AAAA;AAAA,YAGpB,SAAS,OAAO,WAAW,EAAE,UAAU,OAAO,aAAa;AAAA,UAAA,CAC3D;AAAA,QACF;AACA,eAAO,MAAM,OAAO;AAAA,UACnB,OAAO,OAAO;AAAA,UACd,MAAM,OAAO;AAAA,UACb;AAAA,UACA,SAAS;AAAA,UACT,aAAa,OAAO;AAAA,QAAA,CACpB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,MAEb;AAAA,IAAA;AAAA,IAhDF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AAmDF;AAEA,MAAM,eAA4E;AAAA,EACjF,gBAAgB;AAAA,EAChB,sBAAsB;AAAA,EACtB,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,gBAAgB;AAAA,EAChB,oBAAoB;AACrB;;;"}

package/dist/development/src/components/forms/InviteForm.js

@@ -2,9 +2,11 @@ import { jsxDEV } from "react/jsx-dev-runtime";
 import { TenantForm } from "./TenantForm.js";
 import { useForm } from "../../contexts.js";
 import { useInviteMutation } from "../../hooks/mutations/invite/useInviteMutation.js";
+import { useUnmanagedInviteMutation } from "../../hooks/mutations/invite/useUnmanagedInviteMutation.js";
 const useInviteForm = useForm;
-const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions }) => {
+const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions, allowUnmanaged }) => {
   const invite = useInviteMutation();
+  const unmanagedInvite = useUnmanagedInviteMutation();
   return /* @__PURE__ */ jsxDEV(
     TenantForm,
     {
@@ -12,7 +14,9 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
       initialValues: {
         email: "",
         name: "",
-        memberships: initialMemberships || []
+        memberships: initialMemberships || [],
+        unmanaged: false,
+        password: ""
       },
       validate: ({ values }) => {
         const errors = [];
@@ -25,6 +29,22 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
         return errors;
       },
       execute: async ({ values }) => {
+        if (values.unmanaged && !allowUnmanaged) {
+          throw new Error(
+            "InviteForm: values.unmanaged is set but the form was not given allowUnmanaged. Pass it to both InviteForm and InviteFormFields."
+          );
+        }
+        if (values.unmanaged) {
+          return await unmanagedInvite({
+            email: values.email,
+            name: values.name,
+            projectSlug,
+            memberships: values.memberships,
+            // An empty password creates the account without one — the person then
+            // has to go through a password reset, which is a legitimate setup.
+            options: values.password ? { password: values.password } : void 0
+          });
+        }
         return await invite({
           email: values.email,
           name: values.name,
@@ -40,7 +60,7 @@ const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, invi
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/InviteForm.tsx",
-      lineNumber: 38,
+      lineNumber: 52,
       columnNumber: 3
     },
     void 0

package/dist/development/src/components/forms/InviteForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"InviteForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/InviteForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { InviteErrorCode, InviteOptions, MembershipInput } from '@contember/graphql-client-tenant'\nimport { InviteMutationResult, useInviteMutation } from '../../hooks/index.js'\n\nexport type InviteFormValues = {\n\temail: string\n\tname: string\n\tmemberships: readonly MembershipInput[]\n}\n\nexport type InviteFormErrorCode =\n\t| InviteErrorCode\n\t| 'UNKNOWN_ERROR'\n\t| 'FIELD_REQUIRED'\n\nexport type InviteFormState = FormState\n\nexport type InviteFormError = FormError<InviteFormValues, InviteFormErrorCode>\n\nexport type InviteFormContextValue = FormContextValue<InviteFormValues, InviteFormErrorCode>\n\nexport interface InviteFormProps {\n\tchildren: ReactElement\n\tprojectSlug: string\n\tinviteOptions?: InviteOptions\n\tinitialMemberships?: readonly MembershipInput[]\n\tonSuccess?: (args: { result: InviteMutationResult }) => void\n}\n\nexport const useInviteForm = useForm as () => InviteFormContextValue\n\nexport const InviteForm = ({ children, onSuccess, projectSlug, initialMemberships, inviteOptions }: InviteFormProps) => {\n\tconst invite = useInviteMutation()\n\treturn (\n\t\t<TenantForm<InviteFormContextValue, InviteMutationResult>\n\t\t\tonSuccess={onSuccess}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tname: '',\n\t\t\t\tmemberships: initialMemberships || [],\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tconst errors: InviteFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t}\n\t\t\t\tif (values.memberships.length === 0) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'memberships' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\treturn await invite({\n\t\t\t\t\temail: values.email,\n\t\t\t\t\tname: values.name,\n\t\t\t\t\tprojectSlug,\n\t\t\t\t\toptions: inviteOptions,\n\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n\nconst errorToField: Record<InviteErrorCode, keyof InviteFormValues | undefined> = {\n\tALREADY_MEMBER: 'email',\n\tINVALID_EMAIL_FORMAT: 'email',\n\tINVALID_MEMBERSHIP: 'memberships',\n\tPROJECT_NOT_FOUND: undefined,\n\tROLE_NOT_FOUND: 'memberships',\n\tVARIABLE_EMPTY: 'memberships',\n\tVARIABLE_NOT_FOUND: 'memberships',\n}\n"],"names":["this"],"mappings":";;;;AAgCO,MAAM,gBAAgB;AAEtB,MAAM,aAAa,CAAC,EAAE,UAAU,WAAW,aAAa,oBAAoB,oBAAqC;AACvH,QAAM,SAAS,kBAAA;AACf,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,QACN,aAAa,sBAAsB,CAAA;AAAA,MAAC;AAAA,MAErC,UAAU,CAAC,EAAE,aAAa;AACzB,cAAM,SAA4B,CAAA;AAClC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD;AACA,YAAI,OAAO,YAAY,WAAW,GAAG;AACpC,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,eAAe;AAAA,QAC7D;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,eAAO,MAAM,OAAO;AAAA,UACnB,OAAO,OAAO;AAAA,UACd,MAAM,OAAO;AAAA,UACb;AAAA,UACA,SAAS;AAAA,UACT,aAAa,OAAO;AAAA,QAAA,CACpB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,MAEb;AAAA,IAAA;AAAA,IA5BF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AA+BF;AAEA,MAAM,eAA4E;AAAA,EACjF,gBAAgB;AAAA,EAChB,sBAAsB;AAAA,EACtB,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,gBAAgB;AAAA,EAChB,oBAAoB;AACrB;"}
+{"version":3,"file":"InviteForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/InviteForm.tsx"],"sourcesContent":["import { ReactElement } from 'react'\nimport { TenantForm } from './TenantForm.js'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { InviteErrorCode, InviteOptions, MembershipInput } from '@contember/graphql-client-tenant'\nimport { InviteMutationResult, useInviteMutation, useUnmanagedInviteMutation } from '../../hooks/index.js'\n\nexport type InviteFormValues = {\n\temail: string\n\tname: string\n\tmemberships: readonly MembershipInput[]\n\t/** Switches to `unmanagedInvite`: create the member without sending mail. Requires `allowUnmanaged` on the form. */\n\tunmanaged: boolean\n\t/** Only read when `unmanaged` is set; empty means the account is created without a password. */\n\tpassword: string\n}\n\nexport type InviteFormErrorCode =\n\t| InviteErrorCode\n\t| 'UNKNOWN_ERROR'\n\t| 'FIELD_REQUIRED'\n\nexport type InviteFormState = FormState\n\nexport type InviteFormError = FormError<InviteFormValues, InviteFormErrorCode>\n\nexport type InviteFormContextValue = FormContextValue<InviteFormValues, InviteFormErrorCode>\n\nexport interface InviteFormProps {\n\tchildren: ReactElement\n\tprojectSlug: string\n\tinviteOptions?: InviteOptions\n\tinitialMemberships?: readonly MembershipInput[]\n\t/**\n\t * Lets the form submit through `unmanagedInvite` when `values.unmanaged` is\n\t * set — no invitation e-mail, optionally with a password. Off by default, so\n\t * a host app has to opt into offering it. Submitting with `values.unmanaged`\n\t * set but this off throws rather than falling back to a mailed invitation.\n\t */\n\tallowUnmanaged?: boolean\n\tonSuccess?: (args: { result: InviteMutationResult }) => void\n}\n\nexport const useInviteForm = useForm as () => InviteFormContextValue\n\nexport const InviteForm = (\n\t{ children, onSuccess, projectSlug, initialMemberships, inviteOptions, allowUnmanaged }: InviteFormProps,\n) => {\n\tconst invite = useInviteMutation()\n\tconst unmanagedInvite = useUnmanagedInviteMutation()\n\treturn (\n\t\t<TenantForm<InviteFormContextValue, InviteMutationResult>\n\t\t\tonSuccess={onSuccess}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tname: '',\n\t\t\t\tmemberships: initialMemberships || [],\n\t\t\t\tunmanaged: false,\n\t\t\t\tpassword: '',\n\t\t\t}}\n\t\t\tvalidate={({ values }) => {\n\t\t\t\tconst errors: InviteFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t}\n\t\t\t\tif (values.memberships.length === 0) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'memberships' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tif (values.unmanaged && !allowUnmanaged) {\n\t\t\t\t\t// `InviteFormFields` takes its own `allowUnmanaged`, so the two can drift.\n\t\t\t\t\t// Failing beats quietly mailing someone who asked for no mail.\n\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t'InviteForm: values.unmanaged is set but the form was not given allowUnmanaged. Pass it to both InviteForm and InviteFormFields.',\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t\tif (values.unmanaged) {\n\t\t\t\t\treturn await unmanagedInvite({\n\t\t\t\t\t\temail: values.email,\n\t\t\t\t\t\tname: values.name,\n\t\t\t\t\t\tprojectSlug,\n\t\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t\t\t// An empty password creates the account without one — the person then\n\t\t\t\t\t\t// has to go through a password reset, which is a legitimate setup.\n\t\t\t\t\t\toptions: values.password ? { password: values.password } : undefined,\n\t\t\t\t\t})\n\t\t\t\t}\n\t\t\t\treturn await invite({\n\t\t\t\t\temail: values.email,\n\t\t\t\t\tname: values.name,\n\t\t\t\t\tprojectSlug,\n\t\t\t\t\toptions: inviteOptions,\n\t\t\t\t\tmemberships: values.memberships,\n\t\t\t\t})\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\n\nconst errorToField: Record<InviteErrorCode, keyof InviteFormValues | undefined> = {\n\tALREADY_MEMBER: 'email',\n\tINVALID_EMAIL_FORMAT: 'email',\n\tINVALID_MEMBERSHIP: 'memberships',\n\tPROJECT_NOT_FOUND: undefined,\n\tROLE_NOT_FOUND: 'memberships',\n\tVARIABLE_EMPTY: 'memberships',\n\tVARIABLE_NOT_FOUND: 'memberships',\n}\n"],"names":["this"],"mappings":";;;;;AA2CO,MAAM,gBAAgB;AAEtB,MAAM,aAAa,CACzB,EAAE,UAAU,WAAW,aAAa,oBAAoB,eAAe,qBACnE;AACJ,QAAM,SAAS,kBAAA;AACf,QAAM,kBAAkB,2BAAA;AACxB,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,QACN,aAAa,sBAAsB,CAAA;AAAA,QACnC,WAAW;AAAA,QACX,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,aAAa;AACzB,cAAM,SAA4B,CAAA;AAClC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD;AACA,YAAI,OAAO,YAAY,WAAW,GAAG;AACpC,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,eAAe;AAAA,QAC7D;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,YAAI,OAAO,aAAa,CAAC,gBAAgB;AAGxC,gBAAM,IAAI;AAAA,YACT;AAAA,UAAA;AAAA,QAEF;AACA,YAAI,OAAO,WAAW;AACrB,iBAAO,MAAM,gBAAgB;AAAA,YAC5B,OAAO,OAAO;AAAA,YACd,MAAM,OAAO;AAAA,YACb;AAAA,YACA,aAAa,OAAO;AAAA;AAAA;AAAA,YAGpB,SAAS,OAAO,WAAW,EAAE,UAAU,OAAO,aAAa;AAAA,UAAA,CAC3D;AAAA,QACF;AACA,eAAO,MAAM,OAAO;AAAA,UACnB,OAAO,OAAO;AAAA,UACd,MAAM,OAAO;AAAA,UACb;AAAA,UACA,SAAS;AAAA,UACT,aAAa,OAAO;AAAA,QAAA,CACpB;AAAA,MACF;AAAA,MACA,cAAc;AAAA,MAEb;AAAA,IAAA;AAAA,IAhDF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AAmDF;AAEA,MAAM,eAA4E;AAAA,EACjF,gBAAgB;AAAA,EAChB,sBAAsB;AAAA,EACtB,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,gBAAgB;AAAA,EAChB,oBAAoB;AACrB;"}

package/dist/development/src/components/forms/LoginForm.cjs

@@ -27,7 +27,8 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
       initialValues: {
         email: "",
         password: "",
-        otpToken: ""
+        otpToken: "",
+        backupCode: ""
       },
       validate: ({ values, state }) => {
         const errors = [];
@@ -41,7 +42,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
         } else if (values.password.length < 6) {
           errors.push({ code: "INVALID_VALUE", field: "password" });
         }
-        if (!values.otpToken && state === "otp-required") {
+        if (!values.otpToken && !values.backupCode && state === "otp-required") {
           errors.push({ code: "FIELD_REQUIRED", field: "otpToken" });
         } else if (values.otpToken && !values.otpToken.match(/^\d{6}$/)) {
           errors.push({ code: "INVALID_VALUE", field: "otpToken" });
@@ -53,6 +54,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
           email: values.email,
           password: values.password,
           otpToken: values.otpToken || void 0,
+          backupCode: values.backupCode || void 0,
           expiration
         });
         if (!result.ok && result.error === "OTP_REQUIRED") {
@@ -66,7 +68,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/LoginForm.tsx",
-      lineNumber: 50,
+      lineNumber: 52,
       columnNumber: 3
     },
     void 0
@@ -82,6 +84,8 @@ const errorToField = {
   "RATE_LIMIT_EXCEEDED": "password",
   "OTP_REQUIRED": void 0,
   "MFA_ENROLLMENT_REQUIRED": void 0,
+  // Form-level, not a field: it is the account that cannot use a local credential.
+  "IDP_REQUIRED": void 0,
   "EMAIL_NOT_VERIFIED": "email"
 };
 exports.LoginForm = LoginForm;

package/dist/development/src/components/forms/LoginForm.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"LoginForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/LoginForm.tsx"],"sourcesContent":["import { ReactElement, useCallback, useMemo } from 'react'\nimport * as TenantApi from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { SignInErrorCode } from '@contember/graphql-client-tenant'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { SignInMutationResult, useSignInMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\n\nexport type LoginFormValues = {\n\temail: string\n\tpassword: string\n\totpToken: string\n}\n\nexport type LoginFormErrorCode =\n\t| SignInErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type LoginFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type LoginFormError = FormError<LoginFormValues, LoginFormErrorCode>\n\nexport type LoginFormContextValue = FormContextValue<LoginFormValues, LoginFormErrorCode, LoginFormState>\n\nexport interface LoginFormProps {\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const useLoginForm = useForm as () => LoginFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\n\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess }: LoginFormProps) => {\n\tconst login = useSignInMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<LoginFormContextValue, SignInMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tpassword: '',\n\t\t\t\totpToken: '',\n\t\t\t}}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tconst errors: LoginFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t} else if (!values.email.match(/^.+@.+$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'email' })\n\t\t\t\t}\n\n\t\t\t\tif (!values.password) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'password' })\n\t\t\t\t} else if (values.password.length < 6) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'password' })\n\t\t\t\t}\n\t\t\t\tif (!values.otpToken && state === 'otp-required') {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'otpToken' })\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'otpToken' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tconst result = await login({\n\t\t\t\t\temail: values.email!,\n\t\t\t\t\tpassword: values.password!,\n\t\t\t\t\totpToken: values.otpToken || undefined,\n\t\t\t\t\texpiration: expiration,\n\t\t\t\t})\n\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInErrorCode, keyof LoginFormValues | undefined> = {\n\t'INVALID_PASSWORD': 'password',\n\t'NO_PASSWORD_SET': 'password',\n\t'UNKNOWN_EMAIL': 'email',\n\t'PERSON_DISABLED': 'email',\n\t'INVALID_OTP_TOKEN': 'otpToken',\n\t'INVALID_CREDENTIALS': 'password',\n\t'RATE_LIMIT_EXCEEDED': 'password',\n\t'OTP_REQUIRED': undefined,\n\t'MFA_ENROLLMENT_REQUIRED': undefined,\n\t'EMAIL_NOT_VERIFIED': 'email',\n}\n"],"names":["useForm","useSignInMutation","useRedirectToBacklinkCallback","useSetSessionToken","jsxDEV","TenantForm","this"],"mappings":";;;;;;;;AAoCO,MAAM,eAAeA,SAAAA;AAE5B,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AAEA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,YAAY,CAAC,EAAE,UAAU,aAAa,0BAA0B,gBAAgC;AAC5G,QAAM,QAAQC,kBAAAA,kBAAkB,EAAE,SAAS;AAC3C,QAAM,qBAAqBC,sBAAAA,8BAAA;AAC3B,QAAM,kBAAkBC,YAAAA,mBAAA;AACxB,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAe;AAAA,QACd,OAAO;AAAA,QACP,UAAU;AAAA,QACV,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,cAAM,SAA2B,CAAA;AACjC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD,WAAW,CAAC,OAAO,MAAM,MAAM,SAAS,GAAG;AAC1C,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,SAAS;AAAA,QACtD;AAEA,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,SAAS,SAAS,GAAG;AACtC,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,YAAI,CAAC,OAAO,YAAY,UAAU,gBAAgB;AACjD,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,cAAM,SAAS,MAAM,MAAM;AAAA,UAC1B,OAAO,OAAO;AAAA,UACd,UAAU,OAAO;AAAA,UACjB,UAAU,OAAO,YAAY;AAAA,UAC7B;AAAA,QAAA,CACA;AAED,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR;AAAA,MAEC;AAAA,IAAA;AAAA,IA/CF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AAkDF;AACA,MAAM,eAAqF;AAAA,EAC1F,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,mBAAmB;AAAA,EACnB,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EACvB,uBAAuB;AAAA,EACvB,gBAAgB;AAAA,EAChB,2BAA2B;AAAA,EAC3B,sBAAsB;AACvB;;;"}
+{"version":3,"file":"LoginForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/LoginForm.tsx"],"sourcesContent":["import { ReactElement, useCallback, useMemo } from 'react'\nimport * as TenantApi from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { SignInErrorCode } from '@contember/graphql-client-tenant'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { SignInMutationResult, useSignInMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\n\nexport type LoginFormValues = {\n\temail: string\n\tpassword: string\n\totpToken: string\n\t/** Alternative to `otpToken` for a user who lost their authenticator. */\n\tbackupCode: string\n}\n\nexport type LoginFormErrorCode =\n\t| SignInErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type LoginFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type LoginFormError = FormError<LoginFormValues, LoginFormErrorCode>\n\nexport type LoginFormContextValue = FormContextValue<LoginFormValues, LoginFormErrorCode, LoginFormState>\n\nexport interface LoginFormProps {\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const useLoginForm = useForm as () => LoginFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\n\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess }: LoginFormProps) => {\n\tconst login = useSignInMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<LoginFormContextValue, SignInMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tpassword: '',\n\t\t\t\totpToken: '',\n\t\t\t\tbackupCode: '',\n\t\t\t}}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tconst errors: LoginFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t} else if (!values.email.match(/^.+@.+$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'email' })\n\t\t\t\t}\n\n\t\t\t\tif (!values.password) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'password' })\n\t\t\t\t} else if (values.password.length < 6) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'password' })\n\t\t\t\t}\n\t\t\t\t// In the otp-required step either an otpToken or a backup code will do.\n\t\t\t\tif (!values.otpToken && !values.backupCode && state === 'otp-required') {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'otpToken' })\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'otpToken' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tconst result = await login({\n\t\t\t\t\temail: values.email!,\n\t\t\t\t\tpassword: values.password!,\n\t\t\t\t\totpToken: values.otpToken || undefined,\n\t\t\t\t\tbackupCode: values.backupCode || undefined,\n\t\t\t\t\texpiration: expiration,\n\t\t\t\t})\n\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInErrorCode, keyof LoginFormValues | undefined> = {\n\t'INVALID_PASSWORD': 'password',\n\t'NO_PASSWORD_SET': 'password',\n\t'UNKNOWN_EMAIL': 'email',\n\t'PERSON_DISABLED': 'email',\n\t'INVALID_OTP_TOKEN': 'otpToken',\n\t'INVALID_CREDENTIALS': 'password',\n\t'RATE_LIMIT_EXCEEDED': 'password',\n\t'OTP_REQUIRED': undefined,\n\t'MFA_ENROLLMENT_REQUIRED': undefined,\n\t// Form-level, not a field: it is the account that cannot use a local credential.\n\t'IDP_REQUIRED': undefined,\n\t'EMAIL_NOT_VERIFIED': 'email',\n}\n"],"names":["useForm","useSignInMutation","useRedirectToBacklinkCallback","useSetSessionToken","jsxDEV","TenantForm","this"],"mappings":";;;;;;;;AAsCO,MAAM,eAAeA,SAAAA;AAE5B,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AAEA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,YAAY,CAAC,EAAE,UAAU,aAAa,0BAA0B,gBAAgC;AAC5G,QAAM,QAAQC,kBAAAA,kBAAkB,EAAE,SAAS;AAC3C,QAAM,qBAAqBC,sBAAAA,8BAAA;AAC3B,QAAM,kBAAkBC,YAAAA,mBAAA;AACxB,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAe;AAAA,QACd,OAAO;AAAA,QACP,UAAU;AAAA,QACV,UAAU;AAAA,QACV,YAAY;AAAA,MAAA;AAAA,MAEb,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,cAAM,SAA2B,CAAA;AACjC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD,WAAW,CAAC,OAAO,MAAM,MAAM,SAAS,GAAG;AAC1C,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,SAAS;AAAA,QACtD;AAEA,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,SAAS,SAAS,GAAG;AACtC,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AAEA,YAAI,CAAC,OAAO,YAAY,CAAC,OAAO,cAAc,UAAU,gBAAgB;AACvE,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,cAAM,SAAS,MAAM,MAAM;AAAA,UAC1B,OAAO,OAAO;AAAA,UACd,UAAU,OAAO;AAAA,UACjB,UAAU,OAAO,YAAY;AAAA,UAC7B,YAAY,OAAO,cAAc;AAAA,UACjC;AAAA,QAAA,CACA;AAED,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR;AAAA,MAEC;AAAA,IAAA;AAAA,IAlDF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AAqDF;AACA,MAAM,eAAqF;AAAA,EAC1F,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,mBAAmB;AAAA,EACnB,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EACvB,uBAAuB;AAAA,EACvB,gBAAgB;AAAA,EAChB,2BAA2B;AAAA;AAAA,EAE3B,gBAAgB;AAAA,EAChB,sBAAsB;AACvB;;;"}

package/dist/development/src/components/forms/LoginForm.js

@@ -25,7 +25,8 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
       initialValues: {
         email: "",
         password: "",
-        otpToken: ""
+        otpToken: "",
+        backupCode: ""
       },
       validate: ({ values, state }) => {
         const errors = [];
@@ -39,7 +40,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
         } else if (values.password.length < 6) {
           errors.push({ code: "INVALID_VALUE", field: "password" });
         }
-        if (!values.otpToken && state === "otp-required") {
+        if (!values.otpToken && !values.backupCode && state === "otp-required") {
           errors.push({ code: "FIELD_REQUIRED", field: "otpToken" });
         } else if (values.otpToken && !values.otpToken.match(/^\d{6}$/)) {
           errors.push({ code: "INVALID_VALUE", field: "otpToken" });
@@ -51,6 +52,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
           email: values.email,
           password: values.password,
           otpToken: values.otpToken || void 0,
+          backupCode: values.backupCode || void 0,
           expiration
         });
         if (!result.ok && result.error === "OTP_REQUIRED") {
@@ -64,7 +66,7 @@ const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/LoginForm.tsx",
-      lineNumber: 50,
+      lineNumber: 52,
       columnNumber: 3
     },
     void 0
@@ -80,6 +82,8 @@ const errorToField = {
   "RATE_LIMIT_EXCEEDED": "password",
   "OTP_REQUIRED": void 0,
   "MFA_ENROLLMENT_REQUIRED": void 0,
+  // Form-level, not a field: it is the account that cannot use a local credential.
+  "IDP_REQUIRED": void 0,
   "EMAIL_NOT_VERIFIED": "email"
 };
 export {

package/dist/development/src/components/forms/LoginForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/LoginForm.tsx"],"sourcesContent":["import { ReactElement, useCallback, useMemo } from 'react'\nimport * as TenantApi from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { SignInErrorCode } from '@contember/graphql-client-tenant'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { SignInMutationResult, useSignInMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\n\nexport type LoginFormValues = {\n\temail: string\n\tpassword: string\n\totpToken: string\n}\n\nexport type LoginFormErrorCode =\n\t| SignInErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type LoginFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type LoginFormError = FormError<LoginFormValues, LoginFormErrorCode>\n\nexport type LoginFormContextValue = FormContextValue<LoginFormValues, LoginFormErrorCode, LoginFormState>\n\nexport interface LoginFormProps {\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const useLoginForm = useForm as () => LoginFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\n\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess }: LoginFormProps) => {\n\tconst login = useSignInMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<LoginFormContextValue, SignInMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tpassword: '',\n\t\t\t\totpToken: '',\n\t\t\t}}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tconst errors: LoginFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t} else if (!values.email.match(/^.+@.+$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'email' })\n\t\t\t\t}\n\n\t\t\t\tif (!values.password) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'password' })\n\t\t\t\t} else if (values.password.length < 6) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'password' })\n\t\t\t\t}\n\t\t\t\tif (!values.otpToken && state === 'otp-required') {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'otpToken' })\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'otpToken' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tconst result = await login({\n\t\t\t\t\temail: values.email!,\n\t\t\t\t\tpassword: values.password!,\n\t\t\t\t\totpToken: values.otpToken || undefined,\n\t\t\t\t\texpiration: expiration,\n\t\t\t\t})\n\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInErrorCode, keyof LoginFormValues | undefined> = {\n\t'INVALID_PASSWORD': 'password',\n\t'NO_PASSWORD_SET': 'password',\n\t'UNKNOWN_EMAIL': 'email',\n\t'PERSON_DISABLED': 'email',\n\t'INVALID_OTP_TOKEN': 'otpToken',\n\t'INVALID_CREDENTIALS': 'password',\n\t'RATE_LIMIT_EXCEEDED': 'password',\n\t'OTP_REQUIRED': undefined,\n\t'MFA_ENROLLMENT_REQUIRED': undefined,\n\t'EMAIL_NOT_VERIFIED': 'email',\n}\n"],"names":["this"],"mappings":";;;;;;AAoCO,MAAM,eAAe;AAE5B,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AAEA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,YAAY,CAAC,EAAE,UAAU,aAAa,0BAA0B,gBAAgC;AAC5G,QAAM,QAAQ,kBAAkB,EAAE,SAAS;AAC3C,QAAM,qBAAqB,8BAAA;AAC3B,QAAM,kBAAkB,mBAAA;AACxB,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAe;AAAA,QACd,OAAO;AAAA,QACP,UAAU;AAAA,QACV,UAAU;AAAA,MAAA;AAAA,MAEX,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,cAAM,SAA2B,CAAA;AACjC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD,WAAW,CAAC,OAAO,MAAM,MAAM,SAAS,GAAG;AAC1C,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,SAAS;AAAA,QACtD;AAEA,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,SAAS,SAAS,GAAG;AACtC,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,YAAI,CAAC,OAAO,YAAY,UAAU,gBAAgB;AACjD,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,cAAM,SAAS,MAAM,MAAM;AAAA,UAC1B,OAAO,OAAO;AAAA,UACd,UAAU,OAAO;AAAA,UACjB,UAAU,OAAO,YAAY;AAAA,UAC7B;AAAA,QAAA,CACA;AAED,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR;AAAA,MAEC;AAAA,IAAA;AAAA,IA/CF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AAkDF;AACA,MAAM,eAAqF;AAAA,EAC1F,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,mBAAmB;AAAA,EACnB,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EACvB,uBAAuB;AAAA,EACvB,gBAAgB;AAAA,EAChB,2BAA2B;AAAA,EAC3B,sBAAsB;AACvB;"}
+{"version":3,"file":"LoginForm.js","sources":["../../../../../../packages/react-client-tenant/src/components/forms/LoginForm.tsx"],"sourcesContent":["import { ReactElement, useCallback, useMemo } from 'react'\nimport * as TenantApi from '@contember/graphql-client-tenant'\nimport { TenantForm } from './TenantForm.js'\nimport { SignInErrorCode } from '@contember/graphql-client-tenant'\nimport { FormContextValue, FormError, FormState } from '../../types/index.js'\nimport { useForm } from '../../contexts.js'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { SignInMutationResult, useSignInMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\n\nexport type LoginFormValues = {\n\temail: string\n\tpassword: string\n\totpToken: string\n\t/** Alternative to `otpToken` for a user who lost their authenticator. */\n\tbackupCode: string\n}\n\nexport type LoginFormErrorCode =\n\t| SignInErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type LoginFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type LoginFormError = FormError<LoginFormValues, LoginFormErrorCode>\n\nexport type LoginFormContextValue = FormContextValue<LoginFormValues, LoginFormErrorCode, LoginFormState>\n\nexport interface LoginFormProps {\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const useLoginForm = useForm as () => LoginFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\n\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const LoginForm = ({ children, expiration = DEFAULT_LOGIN_EXPIRATION, onSuccess }: LoginFormProps) => {\n\tconst login = useSignInMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<LoginFormContextValue, SignInMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={{\n\t\t\t\temail: '',\n\t\t\t\tpassword: '',\n\t\t\t\totpToken: '',\n\t\t\t\tbackupCode: '',\n\t\t\t}}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tconst errors: LoginFormError[] = []\n\t\t\t\tif (!values.email) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'email' })\n\t\t\t\t} else if (!values.email.match(/^.+@.+$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'email' })\n\t\t\t\t}\n\n\t\t\t\tif (!values.password) {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'password' })\n\t\t\t\t} else if (values.password.length < 6) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'password' })\n\t\t\t\t}\n\t\t\t\t// In the otp-required step either an otpToken or a backup code will do.\n\t\t\t\tif (!values.otpToken && !values.backupCode && state === 'otp-required') {\n\t\t\t\t\terrors.push({ code: 'FIELD_REQUIRED', field: 'otpToken' })\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\terrors.push({ code: 'INVALID_VALUE', field: 'otpToken' })\n\t\t\t\t}\n\t\t\t\treturn errors\n\t\t\t}}\n\t\t\texecute={async ({ values }) => {\n\t\t\t\tconst result = await login({\n\t\t\t\t\temail: values.email!,\n\t\t\t\t\tpassword: values.password!,\n\t\t\t\t\totpToken: values.otpToken || undefined,\n\t\t\t\t\tbackupCode: values.backupCode || undefined,\n\t\t\t\t\texpiration: expiration,\n\t\t\t\t})\n\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInErrorCode, keyof LoginFormValues | undefined> = {\n\t'INVALID_PASSWORD': 'password',\n\t'NO_PASSWORD_SET': 'password',\n\t'UNKNOWN_EMAIL': 'email',\n\t'PERSON_DISABLED': 'email',\n\t'INVALID_OTP_TOKEN': 'otpToken',\n\t'INVALID_CREDENTIALS': 'password',\n\t'RATE_LIMIT_EXCEEDED': 'password',\n\t'OTP_REQUIRED': undefined,\n\t'MFA_ENROLLMENT_REQUIRED': undefined,\n\t// Form-level, not a field: it is the account that cannot use a local credential.\n\t'IDP_REQUIRED': undefined,\n\t'EMAIL_NOT_VERIFIED': 'email',\n}\n"],"names":["this"],"mappings":";;;;;;AAsCO,MAAM,eAAe;AAE5B,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AAEA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,YAAY,CAAC,EAAE,UAAU,aAAa,0BAA0B,gBAAgC;AAC5G,QAAM,QAAQ,kBAAkB,EAAE,SAAS;AAC3C,QAAM,qBAAqB,8BAAA;AAC3B,QAAM,kBAAkB,mBAAA;AACxB,SACC;AAAA,IAAC;AAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAe;AAAA,QACd,OAAO;AAAA,QACP,UAAU;AAAA,QACV,UAAU;AAAA,QACV,YAAY;AAAA,MAAA;AAAA,MAEb,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,cAAM,SAA2B,CAAA;AACjC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACvD,WAAW,CAAC,OAAO,MAAM,MAAM,SAAS,GAAG;AAC1C,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,SAAS;AAAA,QACtD;AAEA,YAAI,CAAC,OAAO,UAAU;AACrB,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,SAAS,SAAS,GAAG;AACtC,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AAEA,YAAI,CAAC,OAAO,YAAY,CAAC,OAAO,cAAc,UAAU,gBAAgB;AACvE,iBAAO,KAAK,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QAC1D,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,KAAK,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACzD;AACA,eAAO;AAAA,MACR;AAAA,MACA,SAAS,OAAO,EAAE,aAAa;AAC9B,cAAM,SAAS,MAAM,MAAM;AAAA,UAC1B,OAAO,OAAO;AAAA,UACd,UAAU,OAAO;AAAA,UACjB,UAAU,OAAO,YAAY;AAAA,UAC7B,YAAY,OAAO,cAAc;AAAA,UACjC;AAAA,QAAA,CACA;AAED,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR;AAAA,MAEC;AAAA,IAAA;AAAA,IAlDF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAA;AAAAA,EAAA;AAqDF;AACA,MAAM,eAAqF;AAAA,EAC1F,oBAAoB;AAAA,EACpB,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,mBAAmB;AAAA,EACnB,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EACvB,uBAAuB;AAAA,EACvB,gBAAgB;AAAA,EAChB,2BAA2B;AAAA;AAAA,EAE3B,gBAAgB;AAAA,EAChB,sBAAsB;AACvB;"}

package/dist/development/src/components/forms/PasswordlessSignInForm.cjs

@@ -27,13 +27,14 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
       errorMapping: errorToField,
       initialValues: React.useMemo(() => ({
         token: token ?? "",
-        otpToken: ""
+        otpToken: "",
+        backupCode: ""
       }), [token]),
       validate: ({ values, state }) => {
         if (!values.token) {
           return [{ code: "FIELD_REQUIRED", field: "token" }];
         }
-        if (!values.otpToken && state === "otp-required") {
+        if (!values.otpToken && !values.backupCode && state === "otp-required") {
           return [{ code: "FIELD_REQUIRED", field: "otpToken" }];
         } else if (values.otpToken && !values.otpToken.match(/^\d{6}$/)) {
           return [{ code: "INVALID_VALUE", field: "otpToken" }];
@@ -46,6 +47,7 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
           expiration,
           token: values.token,
           mfaOtp: values.otpToken || void 0,
+          backupCode: values.backupCode || void 0,
           validationType
         });
         if (!result.ok && result.error === "OTP_REQUIRED") {
@@ -59,7 +61,7 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/PasswordlessSignInForm.tsx",
-      lineNumber: 56,
+      lineNumber: 58,
       columnNumber: 3
     },
     void 0
@@ -73,7 +75,8 @@ const errorToField = {
   TOKEN_INVALID: "token",
   INVALID_OTP_TOKEN: "otpToken",
   OTP_REQUIRED: void 0,
-  MFA_ENROLLMENT_REQUIRED: void 0
+  MFA_ENROLLMENT_REQUIRED: void 0,
+  IDP_REQUIRED: void 0
 };
 exports.PasswordlessSignInForm = PasswordlessSignInForm;
 exports.usePasswordlessSignInForm = usePasswordlessSignInForm;

package/dist/development/src/components/forms/PasswordlessSignInForm.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"PasswordlessSignInForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/PasswordlessSignInForm.tsx"],"sourcesContent":["import * as TenantApi from '@contember/graphql-client-tenant'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { ReactElement, useCallback, useMemo } from 'react'\nimport { useForm } from '../../contexts.js'\nimport { SignInPasswordlessMutationResult, useSignInPasswordlessMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\nimport { FormContextValue, FormError, FormState } from '../../types/forms.js'\nimport { TenantForm } from './TenantForm.js'\n\nexport type PasswordlessSignInFormValues = {\n\ttoken: string\n\totpToken: string\n}\n\nexport type PasswordlessSignInFormErrorCode =\n\t| TenantApi.SignInPasswordlessErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type PasswordlessSignInFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type PasswordlessSignInFormError = FormError<PasswordlessSignInFormValues, PasswordlessSignInFormErrorCode>\n\nexport type PasswordlessSignInFormContextValue = FormContextValue<\n\tPasswordlessSignInFormValues,\n\tPasswordlessSignInFormErrorCode,\n\tPasswordlessSignInFormState\n>\n\nexport interface PasswordlessSignInFormProps {\n\trequestId: string\n\tvalidationType: TenantApi.PasswordlessValidationType\n\ttoken?: string\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const usePasswordlessSignInForm = useForm as () => PasswordlessSignInFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const PasswordlessSignInForm = (\n\t{ children, onSuccess, requestId, validationType, token, expiration = DEFAULT_LOGIN_EXPIRATION }: PasswordlessSignInFormProps,\n) => {\n\tconst signIn = useSignInPasswordlessMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<PasswordlessSignInFormContextValue, SignInPasswordlessMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={useMemo(() => ({\n\t\t\t\ttoken: token ?? '',\n\t\t\t\totpToken: '',\n\t\t\t}), [token])}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tif (!values.token) {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'token' }]\n\t\t\t\t}\n\t\t\t\tif (!values.otpToken && state === 'otp-required') {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'otpToken' }]\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\treturn [{ code: 'INVALID_VALUE', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t\treturn []\n\t\t\t}}\n\t\t\texecute={useCallback(async ({ values }) => {\n\t\t\t\tconst result = await signIn({\n\t\t\t\t\trequestId,\n\t\t\t\t\texpiration,\n\t\t\t\t\ttoken: values.token,\n\t\t\t\t\tmfaOtp: values.otpToken || undefined,\n\t\t\t\t\tvalidationType,\n\t\t\t\t})\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}, [expiration, requestId, signIn, validationType])}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInPasswordlessErrorCode, keyof PasswordlessSignInFormValues | undefined> = {\n\tPERSON_DISABLED: undefined,\n\tTOKEN_EXPIRED: 'token',\n\tTOKEN_NOT_FOUND: 'token',\n\tTOKEN_USED: 'token',\n\tTOKEN_INVALID: 'token',\n\tINVALID_OTP_TOKEN: 'otpToken',\n\tOTP_REQUIRED: undefined,\n\tMFA_ENROLLMENT_REQUIRED: undefined,\n}\n"],"names":["useForm","useSignInPasswordlessMutation","useRedirectToBacklinkCallback","useSetSessionToken","jsxDEV","TenantForm","useMemo","useCallback","this"],"mappings":";;;;;;;;;AAyCO,MAAM,4BAA4BA,SAAAA;AAEzC,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AACA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,yBAAyB,CACrC,EAAE,UAAU,WAAW,WAAW,gBAAgB,OAAO,aAAa,+BAClE;AACJ,QAAM,SAASC,8BAAAA,8BAA8B,EAAE,SAAS;AACxD,QAAM,qBAAqBC,sBAAAA,8BAAA;AAC3B,QAAM,kBAAkBC,YAAAA,mBAAA;AACxB,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAeC,MAAAA,QAAQ,OAAO;AAAA,QAC7B,OAAO,SAAS;AAAA,QAChB,UAAU;AAAA,MAAA,IACP,CAAC,KAAK,CAAC;AAAA,MACX,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACnD;AACA,YAAI,CAAC,OAAO,YAAY,UAAU,gBAAgB;AACjD,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QACtD,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,CAAC,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACrD;AACA,eAAO,CAAA;AAAA,MACR;AAAA,MACA,SAASC,MAAAA,YAAY,OAAO,EAAE,aAAa;AAC1C,cAAM,SAAS,MAAM,OAAO;AAAA,UAC3B;AAAA,UACA;AAAA,UACA,OAAO,OAAO;AAAA,UACd,QAAQ,OAAO,YAAY;AAAA,UAC3B;AAAA,QAAA,CACA;AACD,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR,GAAG,CAAC,YAAY,WAAW,QAAQ,cAAc,CAAC;AAAA,MAEjD;AAAA,IAAA;AAAA,IArCF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AAwCF;AACA,MAAM,eAA8G;AAAA,EACnH,iBAAiB;AAAA,EACjB,eAAe;AAAA,EACf,iBAAiB;AAAA,EACjB,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,mBAAmB;AAAA,EACnB,cAAc;AAAA,EACd,yBAAyB;AAC1B;;;"}
+{"version":3,"file":"PasswordlessSignInForm.cjs","sources":["../../../../../../packages/react-client-tenant/src/components/forms/PasswordlessSignInForm.tsx"],"sourcesContent":["import * as TenantApi from '@contember/graphql-client-tenant'\nimport { useSetSessionToken } from '@contember/react-client'\nimport { ReactElement, useCallback, useMemo } from 'react'\nimport { useForm } from '../../contexts.js'\nimport { SignInPasswordlessMutationResult, useSignInPasswordlessMutation } from '../../hooks/index.js'\nimport { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink.js'\nimport { FormContextValue, FormError, FormState } from '../../types/forms.js'\nimport { TenantForm } from './TenantForm.js'\n\nexport type PasswordlessSignInFormValues = {\n\ttoken: string\n\totpToken: string\n\t/** Alternative to `otpToken` for a user who lost their authenticator. */\n\tbackupCode: string\n}\n\nexport type PasswordlessSignInFormErrorCode =\n\t| TenantApi.SignInPasswordlessErrorCode\n\t| 'FIELD_REQUIRED'\n\t| 'INVALID_VALUE'\n\t| 'UNKNOWN_ERROR'\n\nexport type PasswordlessSignInFormState =\n\t| FormState\n\t| 'otp-required'\n\nexport type PasswordlessSignInFormError = FormError<PasswordlessSignInFormValues, PasswordlessSignInFormErrorCode>\n\nexport type PasswordlessSignInFormContextValue = FormContextValue<\n\tPasswordlessSignInFormValues,\n\tPasswordlessSignInFormErrorCode,\n\tPasswordlessSignInFormState\n>\n\nexport interface PasswordlessSignInFormProps {\n\trequestId: string\n\tvalidationType: TenantApi.PasswordlessValidationType\n\ttoken?: string\n\texpiration?: number\n\tchildren: ReactElement\n\tonSuccess?: () => void\n}\n\nexport const usePasswordlessSignInForm = useForm as () => PasswordlessSignInFormContextValue\n\nconst headers = {\n\t'X-Contember-Token-Path': 'data.mutation.result.token',\n}\nconst DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days\n\nexport const PasswordlessSignInForm = (\n\t{ children, onSuccess, requestId, validationType, token, expiration = DEFAULT_LOGIN_EXPIRATION }: PasswordlessSignInFormProps,\n) => {\n\tconst signIn = useSignInPasswordlessMutation({ headers })\n\tconst redirectToBacklink = useRedirectToBacklinkCallback()\n\tconst setSessionToken = useSetSessionToken()\n\treturn (\n\t\t<TenantForm<PasswordlessSignInFormContextValue, SignInPasswordlessMutationResult>\n\t\t\tonSuccess={args => {\n\t\t\t\tonSuccess?.()\n\t\t\t\tsetSessionToken(args.result.token)\n\t\t\t\tredirectToBacklink()\n\t\t\t}}\n\t\t\terrorMapping={errorToField}\n\t\t\tinitialValues={useMemo(() => ({\n\t\t\t\ttoken: token ?? '',\n\t\t\t\totpToken: '',\n\t\t\t\tbackupCode: '',\n\t\t\t}), [token])}\n\t\t\tvalidate={({ values, state }) => {\n\t\t\t\tif (!values.token) {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'token' }]\n\t\t\t\t}\n\t\t\t\t// In the otp-required step either an otpToken or a backup code will do.\n\t\t\t\tif (!values.otpToken && !values.backupCode && state === 'otp-required') {\n\t\t\t\t\treturn [{ code: 'FIELD_REQUIRED', field: 'otpToken' }]\n\t\t\t\t} else if (values.otpToken && !values.otpToken.match(/^\\d{6}$/)) {\n\t\t\t\t\treturn [{ code: 'INVALID_VALUE', field: 'otpToken' }]\n\t\t\t\t}\n\t\t\t\treturn []\n\t\t\t}}\n\t\t\texecute={useCallback(async ({ values }) => {\n\t\t\t\tconst result = await signIn({\n\t\t\t\t\trequestId,\n\t\t\t\t\texpiration,\n\t\t\t\t\ttoken: values.token,\n\t\t\t\t\tmfaOtp: values.otpToken || undefined,\n\t\t\t\t\tbackupCode: values.backupCode || undefined,\n\t\t\t\t\tvalidationType,\n\t\t\t\t})\n\t\t\t\tif (!result.ok && result.error === 'OTP_REQUIRED') {\n\t\t\t\t\treturn { ...result, state: 'otp-required' }\n\t\t\t\t}\n\n\t\t\t\treturn result\n\t\t\t}, [expiration, requestId, signIn, validationType])}\n\t\t>\n\t\t\t{children}\n\t\t</TenantForm>\n\t)\n}\nconst errorToField: Record<TenantApi.SignInPasswordlessErrorCode, keyof PasswordlessSignInFormValues | undefined> = {\n\tPERSON_DISABLED: undefined,\n\tTOKEN_EXPIRED: 'token',\n\tTOKEN_NOT_FOUND: 'token',\n\tTOKEN_USED: 'token',\n\tTOKEN_INVALID: 'token',\n\tINVALID_OTP_TOKEN: 'otpToken',\n\tOTP_REQUIRED: undefined,\n\tMFA_ENROLLMENT_REQUIRED: undefined,\n\tIDP_REQUIRED: undefined,\n}\n"],"names":["useForm","useSignInPasswordlessMutation","useRedirectToBacklinkCallback","useSetSessionToken","jsxDEV","TenantForm","useMemo","useCallback","this"],"mappings":";;;;;;;;;AA2CO,MAAM,4BAA4BA,SAAAA;AAEzC,MAAM,UAAU;AAAA,EACf,0BAA0B;AAC3B;AACA,MAAM,2BAA2B,KAAK,KAAK;AAEpC,MAAM,yBAAyB,CACrC,EAAE,UAAU,WAAW,WAAW,gBAAgB,OAAO,aAAa,+BAClE;AACJ,QAAM,SAASC,8BAAAA,8BAA8B,EAAE,SAAS;AACxD,QAAM,qBAAqBC,sBAAAA,8BAAA;AAC3B,QAAM,kBAAkBC,YAAAA,mBAAA;AACxB,SACCC,8BAAAA;AAAAA,IAACC,WAAAA;AAAAA,IAAA;AAAA,MACA,WAAW,CAAA,SAAQ;AAClB,oBAAA;AACA,wBAAgB,KAAK,OAAO,KAAK;AACjC,2BAAA;AAAA,MACD;AAAA,MACA,cAAc;AAAA,MACd,eAAeC,MAAAA,QAAQ,OAAO;AAAA,QAC7B,OAAO,SAAS;AAAA,QAChB,UAAU;AAAA,QACV,YAAY;AAAA,MAAA,IACT,CAAC,KAAK,CAAC;AAAA,MACX,UAAU,CAAC,EAAE,QAAQ,YAAY;AAChC,YAAI,CAAC,OAAO,OAAO;AAClB,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,SAAS;AAAA,QACnD;AAEA,YAAI,CAAC,OAAO,YAAY,CAAC,OAAO,cAAc,UAAU,gBAAgB;AACvE,iBAAO,CAAC,EAAE,MAAM,kBAAkB,OAAO,YAAY;AAAA,QACtD,WAAW,OAAO,YAAY,CAAC,OAAO,SAAS,MAAM,SAAS,GAAG;AAChE,iBAAO,CAAC,EAAE,MAAM,iBAAiB,OAAO,YAAY;AAAA,QACrD;AACA,eAAO,CAAA;AAAA,MACR;AAAA,MACA,SAASC,MAAAA,YAAY,OAAO,EAAE,aAAa;AAC1C,cAAM,SAAS,MAAM,OAAO;AAAA,UAC3B;AAAA,UACA;AAAA,UACA,OAAO,OAAO;AAAA,UACd,QAAQ,OAAO,YAAY;AAAA,UAC3B,YAAY,OAAO,cAAc;AAAA,UACjC;AAAA,QAAA,CACA;AACD,YAAI,CAAC,OAAO,MAAM,OAAO,UAAU,gBAAgB;AAClD,iBAAO,EAAE,GAAG,QAAQ,OAAO,eAAA;AAAA,QAC5B;AAEA,eAAO;AAAA,MACR,GAAG,CAAC,YAAY,WAAW,QAAQ,cAAc,CAAC;AAAA,MAEjD;AAAA,IAAA;AAAA,IAxCF;AAAA,IAAA;AAAA,IAAA;AAAA,MAAA,UAAA;AAAA,MAAA,YAAA;AAAA,MAAA,cAAA;AAAA,IAAA;AAAA,IAAAC;AAAAA,EAAA;AA2CF;AACA,MAAM,eAA8G;AAAA,EACnH,iBAAiB;AAAA,EACjB,eAAe;AAAA,EACf,iBAAiB;AAAA,EACjB,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,mBAAmB;AAAA,EACnB,cAAc;AAAA,EACd,yBAAyB;AAAA,EACzB,cAAc;AACf;;;"}

package/dist/development/src/components/forms/PasswordlessSignInForm.js

@@ -25,13 +25,14 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
       errorMapping: errorToField,
       initialValues: useMemo(() => ({
         token: token ?? "",
-        otpToken: ""
+        otpToken: "",
+        backupCode: ""
       }), [token]),
       validate: ({ values, state }) => {
         if (!values.token) {
           return [{ code: "FIELD_REQUIRED", field: "token" }];
         }
-        if (!values.otpToken && state === "otp-required") {
+        if (!values.otpToken && !values.backupCode && state === "otp-required") {
           return [{ code: "FIELD_REQUIRED", field: "otpToken" }];
         } else if (values.otpToken && !values.otpToken.match(/^\d{6}$/)) {
           return [{ code: "INVALID_VALUE", field: "otpToken" }];
@@ -44,6 +45,7 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
           expiration,
           token: values.token,
           mfaOtp: values.otpToken || void 0,
+          backupCode: values.backupCode || void 0,
           validationType
         });
         if (!result.ok && result.error === "OTP_REQUIRED") {
@@ -57,7 +59,7 @@ const PasswordlessSignInForm = ({ children, onSuccess, requestId, validationType
     false,
     {
       fileName: "/home/runner/work/contember/contember/packages/react-client-tenant/src/components/forms/PasswordlessSignInForm.tsx",
-      lineNumber: 56,
+      lineNumber: 58,
       columnNumber: 3
     },
     void 0
@@ -71,7 +73,8 @@ const errorToField = {
   TOKEN_INVALID: "token",
   INVALID_OTP_TOKEN: "otpToken",
   OTP_REQUIRED: void 0,
-  MFA_ENROLLMENT_REQUIRED: void 0
+  MFA_ENROLLMENT_REQUIRED: void 0,
+  IDP_REQUIRED: void 0
 };
 export {
   PasswordlessSignInForm,