@byline/admin 3.20.4 → 4.0.0

package/dist/fields/field-renderer.js

@@ -110,6 +110,8 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                     id: htmlId
                 });
             case 'integer':
+            case 'float':
+            case 'decimal':
                 return /*#__PURE__*/ jsx(NumericalField, {
                     field: hideLabel ? {
                         ...field,

package/dist/fields/numerical/numerical-field.d.ts

@@ -6,13 +6,15 @@
  * Copyright (c) Infonomic Company Limited
  */
 import type { CounterField, DecimalField, FieldComponentSlots, FloatField, IntegerField } from '@byline/core';
+type NumericalValue = string | number | null;
 export declare const NumericalField: ({ field, value, defaultValue, onChange, id, path, components, }: {
     field: IntegerField | FloatField | DecimalField | CounterField;
     value?: string | number | null;
     defaultValue?: string | number | null;
-    onChange?: (value: string) => void;
+    onChange?: (value: NumericalValue) => void;
     id?: string;
     path?: string;
     /** Optional UI component slot overrides from the admin config. */
     components?: FieldComponentSlots;
 }) => import("react").JSX.Element;
+export {};

package/dist/fields/numerical/numerical-field.js

@@ -1,13 +1,39 @@
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
+import { normalizeNumericValue } from "@byline/core";
 import { Input } from "@byline/ui/react";
 import { useFieldError, useFieldValue } from "../../forms/form-context.js";
+const COMPLETE_NUMERIC_RE = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/;
 const NumericalField = ({ field, value, defaultValue, onChange, id, path, components })=>{
     const fieldPath = path ?? field.name;
     const fieldError = useFieldError(fieldPath);
     const fieldValue = useFieldValue(fieldPath);
-    const incomingValue = value ?? fieldValue ?? defaultValue ?? '';
+    const incomingValue = void 0 !== value ? value : void 0 !== fieldValue ? fieldValue : defaultValue ?? null;
     const htmlId = id ?? fieldPath;
-    const displayValue = null == incomingValue ? '' : String(incomingValue);
+    const canonicalDisplay = null == incomingValue ? '' : String(incomingValue);
+    const [displayValue, setDisplayValue] = useState(canonicalDisplay);
+    const [isEditing, setIsEditing] = useState(false);
+    useEffect(()=>{
+        if (!isEditing) setDisplayValue(canonicalDisplay);
+    }, [
+        canonicalDisplay,
+        isEditing
+    ]);
+    const canonicalize = (nextValue)=>{
+        if (null == nextValue || 'string' == typeof nextValue && '' === nextValue.trim()) return null;
+        if ('counter' === field.type) return;
+        if ('string' == typeof nextValue && !COMPLETE_NUMERIC_RE.test(nextValue.trim())) return;
+        try {
+            return normalizeNumericValue(field.type, nextValue, fieldPath);
+        } catch  {
+            return;
+        }
+    };
+    const commit = (nextValue)=>{
+        const canonical = canonicalize(nextValue);
+        if (void 0 !== canonical) onChange?.(canonical);
+        return canonical;
+    };
     const slots = components;
     const CustomLabel = slots?.Label;
     const CustomHelpText = slots?.HelpText;
@@ -35,12 +61,14 @@ const NumericalField = ({ field, value, defaultValue, onChange, id, path, compon
     const renderInput = ()=>{
         if (CustomField) return /*#__PURE__*/ jsx(CustomField, {
             ...slotBaseProps,
-            onChange: (v)=>onChange?.(v),
+            onChange: (nextValue)=>commit(nextValue),
             defaultValue: defaultValue,
             placeholder: field.placeholder
         });
         return /*#__PURE__*/ jsx(Input, {
-            type: "number",
+            type: "text",
+            inputMode: 'integer' === field.type || 'counter' === field.type ? 'numeric' : 'decimal',
+            step: 'integer' === field.type || 'counter' === field.type ? 1 : 'any',
             id: htmlId,
             name: field.name,
             label: suppressInputLabel ? void 0 : field.label,
@@ -48,7 +76,16 @@ const NumericalField = ({ field, value, defaultValue, onChange, id, path, compon
             readOnly: field.readOnly,
             helpText: suppressInputHelpText ? void 0 : field.helpText,
             value: displayValue,
-            onChange: (e)=>onChange?.(e.target.value),
+            onFocus: ()=>setIsEditing(true),
+            onChange: (e)=>{
+                setDisplayValue(e.target.value);
+                commit(e.target.value);
+            },
+            onBlur: ()=>{
+                setIsEditing(false);
+                const canonical = commit(displayValue);
+                setDisplayValue(void 0 === canonical ? canonicalDisplay : canonical?.toString() ?? '');
+            },
             error: null != fieldError,
             errorText: fieldError
         });

package/dist/modules/auth/components/sign-in-form.d.ts

@@ -1,5 +1,7 @@
-interface SignInFormProps {
-    /** Destination after successful sign-in. Defaults to `/admin`. */
+export interface SignInFormProps {
+    /** Host-validated root-relative destination after successful sign-in. */
+    redirectTo?: string;
+    /** @deprecated Use `redirectTo`. */
     callbackUrl?: string;
     /**
      * Optional plain "Home" link rendered on the left of the action row.
@@ -8,5 +10,4 @@ interface SignInFormProps {
      */
     homeUrl?: string;
 }
-export declare function SignInForm({ callbackUrl, homeUrl }: SignInFormProps): import("react").JSX.Element;
-export {};
+export declare function SignInForm({ redirectTo, callbackUrl, homeUrl }: SignInFormProps): import("react").JSX.Element;

package/dist/modules/auth/components/sign-in-form.js

@@ -1,12 +1,14 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
+import { getClientConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, Card, Input, LoaderEllipsis } from "@byline/ui/react";
 import classnames from "classnames";
 import { useBylineAdminServices } from "../../../services/admin-services-context.js";
+import { normalizeRootRelativeRedirect, resolveSignInFormRedirect } from "../safe-redirect.js";
 import sign_in_form_module from "./sign-in-form.module.js";
-function SignInForm({ callbackUrl, homeUrl }) {
+function SignInForm({ redirectTo, callbackUrl, homeUrl }) {
     const { adminSignIn } = useBylineAdminServices();
     const { t } = useTranslation('byline-admin');
     const [email, setEmail] = useState('');
@@ -17,6 +19,7 @@ function SignInForm({ callbackUrl, homeUrl }) {
         event.preventDefault();
         if (pending) return;
         if (0 === email.trim().length || 0 === password.length) return void setError(t('auth.signIn.errors.empty'));
+        const destination = resolveSignInFormRedirect(redirectTo, callbackUrl, getClientConfig().routes.admin);
         setPending(true);
         setError(null);
         try {
@@ -26,13 +29,13 @@ function SignInForm({ callbackUrl, homeUrl }) {
                     password
                 }
             });
-            const target = callbackUrl && callbackUrl.length > 0 ? callbackUrl : '/admin';
-            window.location.assign(target);
         } catch (err) {
             console.warn('sign-in failed', err);
             setError(t('auth.signIn.errors.invalidCredentials'));
             setPending(false);
+            return;
         }
+        window.location.assign(normalizeRootRelativeRedirect(destination) ?? '/');
     }
     return /*#__PURE__*/ jsxs(Card, {
         className: classnames('byline-sign-in-card', sign_in_form_module.card),

package/dist/modules/auth/safe-redirect.d.ts

@@ -0,0 +1,4 @@
+/** Accept only canonical, unencoded, root-relative same-origin redirect paths. */
+export declare function normalizeRootRelativeRedirect(value: string): string | undefined;
+/** Resolve the new prop first, then the deprecated prop, then a trusted fallback. */
+export declare function resolveSignInFormRedirect(redirectTo: string | undefined, callbackUrl: string | undefined, fallback: string | (() => string)): string;

package/dist/modules/auth/safe-redirect.js

@@ -0,0 +1,20 @@
+import { normalizeRootRelativeRedirect } from "@byline/core";
+function safe_redirect_normalizeRootRelativeRedirect(value) {
+    const normalized = normalizeRootRelativeRedirect(value);
+    if (!normalized) return;
+    let url;
+    try {
+        url = new URL(normalized, 'https://byline.invalid');
+    } catch  {
+        return;
+    }
+    if ('https://byline.invalid' !== url.origin) return;
+    return `${url.pathname}${url.search}${url.hash}`;
+}
+function resolveSignInFormRedirect(redirectTo, callbackUrl, fallback) {
+    const requested = (redirectTo ? safe_redirect_normalizeRootRelativeRedirect(redirectTo) : void 0) ?? (callbackUrl ? safe_redirect_normalizeRootRelativeRedirect(callbackUrl) : void 0);
+    if (requested) return requested;
+    const defaultPath = 'function' == typeof fallback ? fallback() : fallback;
+    return safe_redirect_normalizeRootRelativeRedirect(defaultPath) ?? '/';
+}
+export { resolveSignInFormRedirect, safe_redirect_normalizeRootRelativeRedirect as normalizeRootRelativeRedirect };

package/dist/modules/auth/safe-redirect.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/modules/auth/sign-in-form-props.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/admin",
   "private": false,
   "license": "MPL-2.0",
-  "version": "3.20.4",
+  "version": "4.0.0",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -155,10 +155,10 @@
     "react-diff-viewer-continued": "^4.2.2",
     "uuid": "^14.0.1",
     "zod": "^4.4.3",
-    "@byline/auth": "3.20.4",
-    "@byline/core": "3.20.4",
-    "@byline/ui": "3.20.4",
-    "@byline/i18n": "3.20.4"
+    "@byline/auth": "4.0.0",
+    "@byline/core": "4.0.0",
+    "@byline/ui": "4.0.0",
+    "@byline/i18n": "4.0.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/fields/field-renderer.tsx

@@ -195,6 +195,8 @@ export const FieldRenderer = ({
           />
         )
       case 'integer':
+      case 'float':
+      case 'decimal':
         return (
           <NumericalField
             field={hideLabel ? { ...field, label: undefined } : field}

package/src/fields/numerical/numerical-field.tsx

@@ -6,6 +6,8 @@
  * Copyright (c) Infonomic Company Limited
  */
 
+import { useEffect, useState } from 'react'
+
 import type {
   CounterField,
   DecimalField,
@@ -14,10 +16,15 @@ import type {
   FloatField,
   IntegerField,
 } from '@byline/core'
+import { normalizeNumericValue } from '@byline/core'
 import { Input } from '@byline/ui/react'
 
 import { useFieldError, useFieldValue } from '../../forms/form-context'
 
+type NumericalValue = string | number | null
+
+const COMPLETE_NUMERIC_RE = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/
+
 export const NumericalField = ({
   field,
   value,
@@ -30,7 +37,7 @@ export const NumericalField = ({
   field: IntegerField | FloatField | DecimalField | CounterField
   value?: string | number | null
   defaultValue?: string | number | null
-  onChange?: (value: string) => void
+  onChange?: (value: NumericalValue) => void
   id?: string
   path?: string
   /** Optional UI component slot overrides from the admin config. */
@@ -38,11 +45,36 @@ export const NumericalField = ({
 }) => {
   const fieldPath = path ?? field.name
   const fieldError = useFieldError(fieldPath)
-  const fieldValue = useFieldValue<string | number | undefined>(fieldPath)
-  const incomingValue = value ?? fieldValue ?? defaultValue ?? ''
+  const fieldValue = useFieldValue<NumericalValue | undefined>(fieldPath)
+  const incomingValue =
+    value !== undefined ? value : fieldValue !== undefined ? fieldValue : (defaultValue ?? null)
   const htmlId = id ?? fieldPath
-  const displayValue =
-    incomingValue === undefined || incomingValue === null ? '' : String(incomingValue)
+  const canonicalDisplay = incomingValue == null ? '' : String(incomingValue)
+  const [displayValue, setDisplayValue] = useState(canonicalDisplay)
+  const [isEditing, setIsEditing] = useState(false)
+
+  useEffect(() => {
+    if (!isEditing) setDisplayValue(canonicalDisplay)
+  }, [canonicalDisplay, isEditing])
+
+  const canonicalize = (nextValue: NumericalValue): NumericalValue | undefined => {
+    if (nextValue == null || (typeof nextValue === 'string' && nextValue.trim() === '')) return null
+    if (field.type === 'counter') return undefined
+    if (typeof nextValue === 'string' && !COMPLETE_NUMERIC_RE.test(nextValue.trim())) {
+      return undefined
+    }
+    try {
+      return normalizeNumericValue(field.type, nextValue, fieldPath)
+    } catch {
+      return undefined
+    }
+  }
+
+  const commit = (nextValue: NumericalValue) => {
+    const canonical = canonicalize(nextValue)
+    if (canonical !== undefined) onChange?.(canonical)
+    return canonical
+  }
 
   // Custom component slots (from admin config)
   const slots = components
@@ -79,7 +111,7 @@ export const NumericalField = ({
       return (
         <CustomField
           {...slotBaseProps}
-          onChange={(v: any) => onChange?.(v)}
+          onChange={(nextValue: NumericalValue) => commit(nextValue)}
           defaultValue={defaultValue}
           placeholder={field.placeholder}
         />
@@ -87,7 +119,9 @@ export const NumericalField = ({
     }
     return (
       <Input
-        type="number"
+        type="text"
+        inputMode={field.type === 'integer' || field.type === 'counter' ? 'numeric' : 'decimal'}
+        step={field.type === 'integer' || field.type === 'counter' ? 1 : 'any'}
         id={htmlId}
         name={field.name}
         label={suppressInputLabel ? undefined : field.label}
@@ -95,7 +129,18 @@ export const NumericalField = ({
         readOnly={field.readOnly}
         helpText={suppressInputHelpText ? undefined : field.helpText}
         value={displayValue}
-        onChange={(e) => onChange?.(e.target.value)}
+        onFocus={() => setIsEditing(true)}
+        onChange={(e) => {
+          setDisplayValue(e.target.value)
+          commit(e.target.value)
+        }}
+        onBlur={() => {
+          setIsEditing(false)
+          const canonical = commit(displayValue)
+          setDisplayValue(
+            canonical === undefined ? canonicalDisplay : (canonical?.toString() ?? '')
+          )
+        }}
         error={fieldError != null}
         errorText={fieldError}
       />

package/src/modules/auth/components/sign-in-form.tsx

@@ -12,8 +12,8 @@
  * Admin sign-in form.
  *
  * Client component — collects email + password, calls the `adminSignIn`
- * server fn, and on success navigates to the caller-supplied
- * `callbackUrl` (or `/admin`). On failure renders a generic "Invalid
+ * server fn, and on success navigates to a safe caller-supplied destination.
+ * On failure renders a generic "Invalid
  * credentials" alert; the provider equalises timing between
  * unknown-email and wrong-password so the UI doesn't distinguish the two.
  *
@@ -25,15 +25,19 @@
 
 import { type FormEvent, useState } from 'react'
 
+import { getClientConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { Alert, Button, Card, Input, LoaderEllipsis } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { useBylineAdminServices } from '../../../services/admin-services-context.js'
+import { normalizeRootRelativeRedirect, resolveSignInFormRedirect } from '../safe-redirect.js'
 import styles from './sign-in-form.module.css'
 
-interface SignInFormProps {
-  /** Destination after successful sign-in. Defaults to `/admin`. */
+export interface SignInFormProps {
+  /** Host-validated root-relative destination after successful sign-in. */
+  redirectTo?: string
+  /** @deprecated Use `redirectTo`. */
   callbackUrl?: string
   /**
    * Optional plain "Home" link rendered on the left of the action row.
@@ -43,7 +47,7 @@ interface SignInFormProps {
   homeUrl?: string
 }
 
-export function SignInForm({ callbackUrl, homeUrl }: SignInFormProps) {
+export function SignInForm({ redirectTo, callbackUrl, homeUrl }: SignInFormProps) {
   const { adminSignIn } = useBylineAdminServices()
   const { t } = useTranslation('byline-admin')
   const [email, setEmail] = useState('')
@@ -59,19 +63,26 @@ export function SignInForm({ callbackUrl, homeUrl }: SignInFormProps) {
       return
     }
 
+    const destination = resolveSignInFormRedirect(
+      redirectTo,
+      callbackUrl,
+      getClientConfig().routes.admin
+    )
+
     setPending(true)
     setError(null)
     try {
       await adminSignIn({ data: { email: email.trim(), password } })
-      const target = callbackUrl && callbackUrl.length > 0 ? callbackUrl : '/admin'
-      // Full-page navigation — the admin layout needs to re-run its
-      // `beforeLoad` guard against the freshly-set session cookies.
-      window.location.assign(target)
     } catch (err) {
       console.warn('sign-in failed', err)
       setError(t('auth.signIn.errors.invalidCredentials'))
       setPending(false)
+      return
     }
+
+    // Keep navigation outside the credential error boundary. A browser-level
+    // navigation failure must not relabel a successful sign-in as bad credentials.
+    window.location.assign(normalizeRootRelativeRedirect(destination) ?? '/')
   }
 
   return (

package/src/modules/auth/safe-redirect.test.node.ts

@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizeRootRelativeRedirect, resolveSignInFormRedirect } from './safe-redirect.js'
+
+describe('normalizeRootRelativeRedirect', () => {
+  it.each([
+    ['/cms', '/cms'],
+    ['/cms/account?tab=profile#name', '/cms/account?tab=profile#name'],
+  ])('accepts %j', (value, expected) => {
+    expect(normalizeRootRelativeRedirect(value)).toBe(expected)
+  })
+
+  it.each([
+    '',
+    ' /cms',
+    'https://evil.test',
+    '//evil.test',
+    '/\\evil.test',
+    '/cms\\account',
+    '/cms\naccount',
+    '%2Fcms',
+    '/%2F%2Fevil.test',
+    '/cms/%5cevil.test',
+    '/cms/%2e/account',
+    '/cms/../account',
+    '/cms/./account',
+    '/cms\u0085account',
+  ])('rejects %j', (value) => {
+    expect(normalizeRootRelativeRedirect(value)).toBeUndefined()
+  })
+})
+
+describe('resolveSignInFormRedirect', () => {
+  it('prefers a safe redirectTo over the deprecated callbackUrl', () => {
+    expect(resolveSignInFormRedirect('/cms/account', '/cms/users', '/cms')).toBe('/cms/account')
+    expect(
+      resolveSignInFormRedirect('/cms/account', undefined, () => {
+        throw new Error('fallback must be lazy')
+      })
+    ).toBe('/cms/account')
+  })
+
+  it('supports a safe deprecated callbackUrl when redirectTo is absent or unsafe', () => {
+    expect(resolveSignInFormRedirect(undefined, '/cms/users', '/cms')).toBe('/cms/users')
+    expect(resolveSignInFormRedirect('https://evil.test', '/cms/users', '/cms')).toBe('/cms/users')
+  })
+
+  it('uses the safe configured fallback without permitting an open redirect', () => {
+    expect(resolveSignInFormRedirect('//evil.test', 'https://evil.test', '/cms')).toBe('/cms')
+    expect(resolveSignInFormRedirect(undefined, undefined, 'https://evil.test')).toBe('/')
+  })
+})

package/src/modules/auth/safe-redirect.ts

@@ -0,0 +1,33 @@
+import { normalizeRootRelativeRedirect as normalizeCoreRedirect } from '@byline/core'
+
+/** Accept only canonical, unencoded, root-relative same-origin redirect paths. */
+export function normalizeRootRelativeRedirect(value: string): string | undefined {
+  const normalized = normalizeCoreRedirect(value)
+  if (!normalized) return undefined
+
+  // Keep an origin check next to the navigation sink even if core validation changes.
+  let url: URL
+  try {
+    url = new URL(normalized, 'https://byline.invalid')
+  } catch {
+    return undefined
+  }
+
+  if (url.origin !== 'https://byline.invalid') return undefined
+  return `${url.pathname}${url.search}${url.hash}`
+}
+
+/** Resolve the new prop first, then the deprecated prop, then a trusted fallback. */
+export function resolveSignInFormRedirect(
+  redirectTo: string | undefined,
+  callbackUrl: string | undefined,
+  fallback: string | (() => string)
+): string {
+  const requested =
+    (redirectTo ? normalizeRootRelativeRedirect(redirectTo) : undefined) ??
+    (callbackUrl ? normalizeRootRelativeRedirect(callbackUrl) : undefined)
+  if (requested) return requested
+
+  const defaultPath = typeof fallback === 'function' ? fallback() : fallback
+  return normalizeRootRelativeRedirect(defaultPath) ?? '/'
+}

package/src/modules/auth/sign-in-form-props.test.node.ts

@@ -0,0 +1,14 @@
+import { describe, expectTypeOf, it } from 'vitest'
+
+import type { SignInFormProps } from './components/sign-in-form.js'
+
+describe('SignInFormProps', () => {
+  it('keeps legacy callbackUrl-only callers type-compatible', () => {
+    expectTypeOf<{ callbackUrl: string }>().toMatchTypeOf<SignInFormProps>()
+  })
+
+  it('accepts the preferred redirectTo prop and no destination prop', () => {
+    expectTypeOf<{ redirectTo: string }>().toMatchTypeOf<SignInFormProps>()
+    expectTypeOf<Record<string, never>>().toMatchTypeOf<SignInFormProps>()
+  })
+})