@byline/host-tanstack-start 4.19.0 → 5.1.0

package/dist/admin-shell/chrome/admin-app-bar.d.ts

@@ -1,3 +1,10 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
 import { type CurrentAdminUser } from '../../server-fns/auth/index.js';
 interface AdminAppBarProps {
     user: CurrentAdminUser;

package/dist/admin-shell/chrome/admin-app-bar.js

@@ -22,13 +22,17 @@ function AdminAppBar({ user }) {
     const { breadCrumbSettings } = useBreadcrumbs();
     const { t } = useTranslation('byline-admin');
     const [signingOut, setSigningOut] = useState(false);
+    const [signOutError, setSignOutError] = useState(false);
     async function handleSignOut() {
         if (signingOut) return;
         setSigningOut(true);
+        setSignOutError(false);
         try {
             await adminSignOut();
-        } catch (err) {
-            console.warn('sign-out request failed', err);
+        } catch  {
+            setSignOutError(true);
+            setSigningOut(false);
+            return;
         }
         window.location.assign(getSignInRoutePath());
     }
@@ -62,6 +66,10 @@ function AdminAppBar({ user }) {
                             })
                         ]
                     }),
+                    signOutError && /*#__PURE__*/ jsx("span", {
+                        role: "alert",
+                        children: "Sign-out could not be confirmed. Please try again."
+                    }),
                     /*#__PURE__*/ jsx(Button, {
                         size: "xs",
                         intent: "secondary",

package/dist/admin-shell/chrome/session-change-boundary.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+import { type ReactNode } from 'react';
+import { type CurrentAdminUser } from '../../server-fns/auth/current-user.js';
+/** Blocks the page until the user explicitly acknowledges freshly verified login identity. */
+export declare function SessionChangeBoundary({ user, children, }: {
+    user?: CurrentAdminUser;
+    children: ReactNode;
+}): string | number | bigint | boolean | import("react").JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | Iterable<ReactNode> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | import("react").ReactPortal | null | undefined> | null | undefined;

package/dist/admin-shell/chrome/session-change-boundary.js

@@ -0,0 +1,87 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useEffect, useState, useSyncExternalStore } from "react";
+import { acceptSession, expectedSession, flagSessionChanged, observeSession, sessionEpoch, sessionIsChanged, startSessionNotifications, subscribeSessionChange } from "../../integrations/session-coordination.js";
+import { getSignInRoutePath } from "../../routes/sign-in-path.js";
+import { getCurrentAdminUser } from "../../server-fns/auth/current-user.js";
+function SessionChangeBoundary({ user, children }) {
+    const epoch = useSyncExternalStore(subscribeSessionChange, sessionEpoch, ()=>0);
+    const changed = sessionIsChanged();
+    const [current, setCurrent] = useState(user);
+    const [error, setError] = useState();
+    const [busy, setBusy] = useState(false);
+    const mismatch = "u" > typeof window && !!user && !!expectedSession() && expectedSession() !== user.sessionId;
+    useEffect(()=>{
+        startSessionNotifications();
+        if (user) try {
+            observeSession(user.sessionId);
+        } catch  {}
+    }, [
+        user
+    ]);
+    useEffect(()=>{
+        if (!changed && !mismatch) return;
+        getCurrentAdminUser().then((verified)=>{
+            if (sessionEpoch() !== epoch) return;
+            setCurrent(verified);
+            setError(void 0);
+        }).catch(()=>setError('The session is no longer available. Please sign in again.'));
+    }, [
+        changed,
+        mismatch,
+        epoch
+    ]);
+    if (!changed && !mismatch) return children;
+    async function acknowledge() {
+        setBusy(true);
+        try {
+            const verified = await getCurrentAdminUser();
+            if (!current || current.sessionId !== verified.sessionId) {
+                setCurrent(verified);
+                setError('The active session changed again. Review the account before continuing.');
+                return;
+            }
+            acceptSession(verified.sessionId);
+            window.location.reload();
+        } catch  {
+            flagSessionChanged();
+            setError('Unable to verify the active session. Please sign in again.');
+        } finally{
+            setBusy(false);
+        }
+    }
+    return /*#__PURE__*/ jsxs("main", {
+        role: "alertdialog",
+        "aria-modal": "true",
+        "aria-labelledby": "session-change-title",
+        children: [
+            /*#__PURE__*/ jsx("h1", {
+                id: "session-change-title",
+                children: "Your session has changed"
+            }),
+            /*#__PURE__*/ jsx("p", {
+                children: "Your previous work has not been retried. Check the active account before continuing."
+            }),
+            current && /*#__PURE__*/ jsxs("p", {
+                children: [
+                    "Active account: ",
+                    current.email
+                ]
+            }),
+            error && /*#__PURE__*/ jsx("p", {
+                role: "alert",
+                children: error
+            }),
+            /*#__PURE__*/ jsx("button", {
+                type: "button",
+                disabled: busy || !current,
+                onClick: acknowledge,
+                children: "Continue as this account"
+            }),
+            /*#__PURE__*/ jsx("a", {
+                href: `${getSignInRoutePath()}?reauthenticate=1`,
+                children: "Sign in again"
+            })
+        ]
+    });
+}
+export { SessionChangeBoundary };

package/dist/admin-shell/chrome/session-change-boundary.test.d.ts

@@ -0,0 +1,8 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+export {};

package/dist/admin-shell/chrome/sign-in-page.d.ts

@@ -7,6 +7,7 @@
  */
 import type { LocaleCode } from '@byline/i18n';
 interface SignInPageProps {
+    reauthenticate?: boolean;
     redirectTo: string;
     activeLocale: LocaleCode;
     homeUrl?: string;
@@ -31,5 +32,5 @@ interface SignInPageProps {
  * Threads an optional host-owned `homeUrl` into `SignInForm` so the form's
  * action row can render a plain "Home" link beside the submit button.
  */
-export declare function SignInPage({ redirectTo, activeLocale, homeUrl }: SignInPageProps): import("react").JSX.Element;
+export declare function SignInPage({ redirectTo, activeLocale, homeUrl, reauthenticate, }: SignInPageProps): import("react").JSX.Element;
 export {};

package/dist/admin-shell/chrome/sign-in-page.js

@@ -1,4 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
 import { SignInForm } from "@byline/admin/auth/components/sign-in-form";
 import { BylineAdminServicesProvider } from "@byline/admin/services";
 import { getAdminConfig } from "@byline/core";
@@ -6,9 +7,44 @@ import { I18nProvider, LanguageMenu } from "@byline/i18n/react";
 import clsx from "clsx";
 import { buildLocaleDefinitions } from "../../i18n/locale-definitions.js";
 import { bylineAdminServices } from "../../integrations/byline-admin-services.js";
+import { coordinateAuthAction, expectedSession, flagSessionChanged, observeSession, renewSingleFlight } from "../../integrations/session-coordination.js";
+import { renewAdminSession } from "../../server-fns/auth/renew.js";
 import { setAdminLocaleFn } from "../../server-fns/i18n/index.js";
+import { SessionChangeBoundary } from "./session-change-boundary.js";
 import sign_in_page_module from "./sign-in-page.module.js";
-function SignInPage({ redirectTo, activeLocale, homeUrl }) {
+function SignInPage({ redirectTo, activeLocale, homeUrl, reauthenticate = false }) {
+    const [checking, setChecking] = useState(!reauthenticate);
+    const [bootstrapError, setBootstrapError] = useState(false);
+    useEffect(()=>{
+        if (reauthenticate) return;
+        let active = true;
+        renewSingleFlight(()=>coordinateAuthAction(async ()=>{
+                const result = await renewAdminSession({
+                    data: {
+                        expectedSessionId: expectedSession() ?? void 0
+                    }
+                });
+                observeSession(result.sessionId);
+            })).then(()=>{
+            if (active) window.location.replace(redirectTo);
+        }).catch((error)=>{
+            if (error?.code === 'ERR_SESSION_CHANGED') flagSessionChanged();
+            else if (![
+                'ERR_UNAUTHENTICATED',
+                'ERR_INVALID_TOKEN',
+                'ERR_REVOKED_TOKEN',
+                'ERR_ACCOUNT_DISABLED'
+            ].includes(error?.code)) setBootstrapError(true);
+        }).finally(()=>{
+            if (active) setChecking(false);
+        });
+        return ()=>{
+            active = false;
+        };
+    }, [
+        redirectTo,
+        reauthenticate
+    ]);
     const { i18n } = getAdminConfig();
     const localeDefinitions = buildLocaleDefinitions(i18n.admin.locales, i18n.admin.localeDefinitions);
     const handleSetLocale = async (next)=>{
@@ -19,7 +55,7 @@ function SignInPage({ redirectTo, activeLocale, homeUrl }) {
         });
         window.location.reload();
     };
-    return /*#__PURE__*/ jsx(I18nProvider, {
+    const content = /*#__PURE__*/ jsx(I18nProvider, {
         bundle: i18n.translations ?? {},
         activeLocale: activeLocale,
         defaultLocale: i18n.admin.defaultLocale,
@@ -30,13 +66,31 @@ function SignInPage({ redirectTo, activeLocale, homeUrl }) {
             children: /*#__PURE__*/ jsxs("main", {
                 className: clsx('byline-sign-in-page', sign_in_page_module.main),
                 children: [
+                    /*#__PURE__*/ jsx("noscript", {
+                        children: "JavaScript is required to sign in or renew your admin session."
+                    }),
                     /*#__PURE__*/ jsx("div", {
                         className: clsx('byline-sign-in-page-bar', sign_in_page_module.bar),
                         children: /*#__PURE__*/ jsx(LanguageMenu, {})
                     }),
                     /*#__PURE__*/ jsx("div", {
                         className: clsx('byline-sign-in-page-inner', sign_in_page_module.inner),
-                        children: /*#__PURE__*/ jsx(SignInForm, {
+                        children: bootstrapError ? /*#__PURE__*/ jsxs("div", {
+                            role: "alert",
+                            children: [
+                                /*#__PURE__*/ jsx("p", {
+                                    children: "Unable to check your session. Please try again."
+                                }),
+                                /*#__PURE__*/ jsx("button", {
+                                    type: "button",
+                                    onClick: ()=>window.location.reload(),
+                                    children: "Try again"
+                                })
+                            ]
+                        }) : checking ? /*#__PURE__*/ jsx("p", {
+                            role: "status",
+                            children: "Checking your session…"
+                        }) : /*#__PURE__*/ jsx(SignInForm, {
                             redirectTo: redirectTo,
                             homeUrl: homeUrl
                         })
@@ -45,5 +99,8 @@ function SignInPage({ redirectTo, activeLocale, homeUrl }) {
             })
         })
     });
+    return reauthenticate ? content : /*#__PURE__*/ jsx(SessionChangeBoundary, {
+        children: content
+    });
 }
 export { SignInPage };

package/dist/admin-shell/collections/edit.d.ts

@@ -8,7 +8,7 @@
 import type { CollectionAdminConfig, MultiCollectionDefinition } from '@byline/core';
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas';
 import type { ContentLocaleOption } from './view-menu.js';
-export declare const EditView: ({ collectionDefinition, adminConfig, initialData, locale, contentLocales, defaultContentLocale, returnSearch, }: {
+export declare const EditView: ({ collectionDefinition, adminConfig, initialData: loadedData, locale, contentLocales, defaultContentLocale, returnSearch, }: {
     collectionDefinition: MultiCollectionDefinition;
     adminConfig?: CollectionAdminConfig;
     initialData: AnyCollectionSchemaTypes['UpdateType'];