zudoku 0.0.0-e4d0ea8 → 0.0.0-e5be921

package/dist/config/validators/validate.js

@@ -1,232 +1,30 @@
 import z from "zod";
 import { fromError } from "zod-validation-error";
-import { InputSidebarSchema } from "./InputSidebarSchema.js";
-const ThemeSchema = z
-    .object({
-    background: z.string(),
-    foreground: z.string(),
-    card: z.string(),
-    cardForeground: z.string(),
-    popover: z.string(),
-    popoverForeground: z.string(),
-    primary: z.string(),
-    primaryForeground: z.string(),
-    secondary: z.string(),
-    secondaryForeground: z.string(),
-    muted: z.string(),
-    mutedForeground: z.string(),
-    accent: z.string(),
-    accentForeground: z.string(),
-    destructive: z.string(),
-    destructiveForeground: z.string(),
-    border: z.string(),
-    input: z.string(),
-    ring: z.string(),
-    radius: z.string(),
-})
-    .partial();
-const ApiConfigSchema = z.object({
-    server: z.string().optional(),
-    navigationId: z.string().optional(),
-});
-const ApiSchema = z.union([
-    z
-        .object({ type: z.literal("url"), input: z.string() })
-        .merge(ApiConfigSchema),
-    z
-        .object({ type: z.literal("file"), input: z.string() })
-        .merge(ApiConfigSchema),
-    z
-        .object({ type: z.literal("raw"), input: z.string() })
-        .merge(ApiConfigSchema),
-]);
-const ApiKeysSchema = z.union([
-    z.object({
-        enabled: z.boolean(),
-        endpoint: z.string(),
-    }),
-    z.object({
-        enabled: z.boolean(),
-        getKeys: z.custom((val) => typeof val === "function"),
-        rollKey: z
-            .custom((val) => typeof val === "function")
-            .optional(),
-        deleteKey: z
-            .custom((val) => typeof val === "function")
-            .optional(),
-        updateKeyDescription: z
-            .custom((val) => typeof val === "function")
-            .optional(),
-        createKey: z
-            .custom((val) => typeof val === "function")
-            .optional(),
-    }),
-]);
-const LogoSchema = z.object({
-    src: z.object({ light: z.string(), dark: z.string() }),
-    alt: z.string().optional(),
-    width: z.string().optional(),
-});
-const SiteMapSchema = z
-    .object({
-    /**
-     * Base url of your website
-     */
-    siteUrl: z.string(),
-    /**
-     * Change frequency.
-     * @default 'daily'
-     */
-    changefreq: z.optional(z.enum([
-        "always",
-        "hourly",
-        "daily",
-        "weekly",
-        "monthly",
-        "yearly",
-        "never",
-    ])),
-    /**
-     * Priority
-     * @default 0.7
-     */
-    priority: z.optional(z.number()),
-    outDir: z.string().optional(),
-    /**
-     * Add <lastmod/> property.
-     * @default true
-     */
-    autoLastmod: z.boolean().optional(),
-    /**
-     * Array of relative paths to exclude from listing on sitemap.xml or sitemap-*.xml.
-     * @example ['/page-0', '/page/example']
-     */
-    exclude: z
-        .union([
-        z.function().returns(z.promise(z.array(z.string()))),
-        z.array(z.string()),
-    ])
-        .optional(),
-})
-    .optional();
-const DocsConfigSchema = z.object({
-    files: z.string(),
-    defaultOptions: z
-        .object({
-        toc: z.boolean(),
-        disablePager: z.boolean(),
-    })
-        .partial()
-        .optional(),
-});
-const TopNavigationItemSchema = z.object({
-    label: z.string(),
-    id: z.string(),
-    default: z.string().optional(),
-});
-const ConfigSchema = z
-    .object({
-    basePath: z.string().optional(),
-    page: z
-        .object({
-        pageTitle: z.string(),
-        logoUrl: z.string(),
-        logo: LogoSchema,
-        banner: z
-            .object({
-            message: z.custom(),
-            color: z
-                .enum(["note", "tip", "info", "caution", "danger"])
-                .or(z.string())
-                .optional(),
-            dismissible: z.boolean().optional(),
-        })
-            .optional(),
-    })
-        .partial(),
-    topNavigation: z.array(TopNavigationItemSchema),
-    sidebar: z.record(InputSidebarSchema),
+import { CommonConfigSchema, refine } from "./common.js";
+/**
+ * These are the configuration elements that are only available if using
+ * zudoku.config.{js,ts,tsx,jsx} files.
+ */
+const CodeConfigSchema = z.object({
     // slotlets are a concept we are working on and not yet finalized
     UNSAFE_slotlets: z.record(z.string(), z.custom()),
-    theme: z
-        .object({
-        light: ThemeSchema,
-        dark: ThemeSchema,
-    })
-        .partial(),
-    metadata: z
-        .object({
-        title: z.string(),
-        description: z.string(),
-        logo: z.string(),
-        favicon: z.string(),
-        generator: z.string(),
-        applicationName: z.string(),
-        referrer: z.string(),
-        keywords: z.array(z.string()),
-        authors: z.array(z.string()),
-        creator: z.string(),
-        publisher: z.string(),
-    })
-        .partial(),
     mdx: z
         .object({
         components: z.custom(),
     })
         .partial(),
-    authentication: z.union([
-        z.object({
-            type: z.literal("clerk"),
-            clerkPubKey: z.custom((val) => typeof val === "string" ? /^pk_(test|live)_\w+$/.test(val) : false),
-            redirectToAfterSignUp: z.string().optional(),
-            redirectToAfterSignIn: z.string().optional(),
-            redirectToAfterSignOut: z.string().optional(),
-        }),
-        z.object({
-            type: z.literal("auth0"),
-            clientId: z.string(),
-            domain: z.string(),
-            audience: z.string().optional(),
-            redirectToAfterSignUp: z.string().optional(),
-            redirectToAfterSignIn: z.string().optional(),
-            redirectToAfterSignOut: z.string().optional(),
-        }),
-    ]),
-    search: z.object({
-        type: z.literal("inkeep"),
-        apiKey: z.string(),
-        integrationId: z.string(),
-        organizationId: z.string(),
-        primaryBrandColor: z.string(),
-        organizationDisplayName: z.string(),
-    }),
-    docs: z.union([DocsConfigSchema, z.array(DocsConfigSchema)]),
-    apis: z.union([ApiSchema, z.array(ApiSchema)]),
-    apiKeys: ApiKeysSchema,
-    redirects: z.array(z.object({ from: z.string(), to: z.string() })),
     customPages: z.array(z.object({
         path: z.string(),
-        element: z.custom(),
+        element: z.custom().optional(),
+        render: z.custom().optional(),
+        prose: z.boolean().optional(),
     })),
     plugins: z.array(z.custom()),
-    sitemap: SiteMapSchema,
     build: z.custom(),
-})
-    .partial()
-    .superRefine((config, ctx) => {
-    // check if sidebar ids are found in top navigation
-    if (!config.sidebar || !config.topNavigation)
-        return;
-    const topNavIds = config.topNavigation.map((item) => item.id);
-    const nonExistentKeys = Object.keys(config.sidebar).filter((key) => !topNavIds.includes(key));
-    if (nonExistentKeys.length > 0) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Sidebar ID [${nonExistentKeys.map((v) => `"${v}"`).join(", ")}] not found in top navigation.
-Following IDs are available: ${topNavIds.join(", ")}`,
-        });
-    }
 });
+const ConfigSchema = CommonConfigSchema.merge(CodeConfigSchema)
+    .partial()
+    .superRefine(refine);
 export function validateConfig(config) {
     const validationResult = ConfigSchema.safeParse(config);
     if (!validationResult.success) {

package/dist/config/validators/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/config/validators/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/config/validators/validate.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAIjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEzD;;;GAGG;AACH,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,iEAAiE;IACjE,eAAe,EAAE,CAAC,CAAC,MAAM,CACvB,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,EAAoD,CAC7D;IACD,GAAG,EAAE,CAAC;SACH,MAAM,CAAC;QACN,UAAU,EAAE,CAAC,CAAC,MAAM,EAAqB;KAC1C,CAAC;SACD,OAAO,EAAE;IACZ,WAAW,EAAE,CAAC,CAAC,KAAK,CAClB,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAA0B,CAAC,QAAQ,EAAE;QACtD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAwC,CAAC,QAAQ,EAAE;QACnE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;KAC9B,CAAC,CACH;IACD,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAgB,CAAC;IAC1C,KAAK,EAAE,CAAC,CAAC,MAAM,EAGX;CACL,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC;KAC5D,OAAO,EAAE;KACT,WAAW,CAAC,MAAM,CAAC,CAAC;AAOvB,MAAM,UAAU,cAAc,CAAC,MAAe;IAC5C,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAExD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export type { ZudokuConfig } from "./config/config.js";
 export type { SidebarConfig as Sidebar, SidebarEntry, } from "./config/validators/InputSidebarSchema.js";
-export type { SlotletComponentProps } from "./lib/components/SlotletProvider.js";
+export type { ExposedComponentProps } from "./lib/components/SlotletProvider.js";
 export type { MDXImport } from "./lib/plugins/markdown/index.js";
-export { DevPortalContext, type ApiIdentity, } from "./lib/core/DevPortalContext.js";
-export type { ApiIdentityPlugin, CommonPlugin, DevPortalPlugin, NavigationPlugin, ProfileMenuPlugin, ProfileNavigationItem, RouteObject, SearchProviderPlugin, } from "./lib/core/plugins.js";
+export type { ApiIdentityPlugin, CommonPlugin, NavigationPlugin, ProfileMenuPlugin, ProfileNavigationItem, RouteObject, SearchProviderPlugin, ZudokuPlugin, } from "./lib/core/plugins.js";
+export { ZudokuContext, type ApiIdentity } from "./lib/core/ZudokuContext.js";
 export type { MdxComponentsType } from "./lib/util/MdxComponents.js";

package/dist/index.js

@@ -1,2 +1,2 @@
-export { DevPortalContext, } from "./lib/core/DevPortalContext.js";
+export { ZudokuContext } from "./lib/core/ZudokuContext.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,gBAAgB,GAEjB,MAAM,gCAAgC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAoB,MAAM,6BAA6B,CAAC"}

package/dist/lib/authentication/AuthenticationPlugin.d.ts

@@ -6,8 +6,10 @@ export declare class AuthenticationPlugin implements PluginInterface {
         element: import("react/jsx-runtime").JSX.Element;
     }[];
     getProfileMenuItems(): {
-        label: string;
-        path: string;
+        readonly label: "Logout";
+        readonly path: "/signout";
+        readonly category: "bottom";
+        readonly icon: import("react").ForwardRefExoticComponent<Omit<import("lucide-react").LucideProps, "ref"> & import("react").RefAttributes<SVGSVGElement>>;
     }[];
 }
 export {};

package/dist/lib/authentication/AuthenticationPlugin.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { LogOutIcon } from "lucide-react";
 import { SignIn } from "./components/SignIn.js";
 import { SignOut } from "./components/SignOut.js";
 import { SignUp } from "./components/SignUp.js";
@@ -24,6 +25,8 @@ export class AuthenticationPlugin {
             {
                 label: "Logout",
                 path: "/signout",
+                category: "bottom",
+                icon: LogOutIcon,
             },
         ];
     }

package/dist/lib/authentication/AuthenticationPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthenticationPlugin.js","sourceRoot":"","sources":["../../../src/lib/authentication/AuthenticationPlugin.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIhD,MAAM,OAAO,oBAAoB;IAC/B,SAAS;QACP,OAAO;YACL;gBACE,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,KAAC,OAAO,KAAG;aACrB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAC,MAAM,KAAG;aACpB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAC,MAAM,KAAG;aACpB;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,OAAO;YACL;gBACE,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,UAAU;aACjB;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"AuthenticationPlugin.js","sourceRoot":"","sources":["../../../src/lib/authentication/AuthenticationPlugin.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIhD,MAAM,OAAO,oBAAoB;IAC/B,SAAS;QACP,OAAO;YACL;gBACE,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,KAAC,OAAO,KAAG;aACrB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAC,MAAM,KAAG;aACpB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAC,MAAM,KAAG;aACpB;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,OAAO;YACL;gBACE,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,UAAU;aACR;SACX,CAAC;IACJ,CAAC;CACF"}

package/dist/lib/authentication/authentication.d.ts

@@ -1,4 +1,4 @@
-import { DevPortalPlugin } from "../core/plugins.js";
+import { ZudokuPlugin } from "../core/plugins.js";
 export interface AuthenticationProvider {
     signUp(options?: {
         redirectTo?: string;
@@ -8,8 +8,8 @@ export interface AuthenticationProvider {
     }): Promise<void>;
     signOut(): Promise<void>;
     getAccessToken(): Promise<string>;
-    pageLoad?(): void;
-    getAuthenticationPlugin?(): DevPortalPlugin;
+    getAuthenticationPlugin?(): ZudokuPlugin;
+    onPageLoad?(): void;
 }
 export interface AuthenticationProviderInitializer<TConfig> {
     (config: TConfig): AuthenticationProvider;

package/dist/lib/authentication/components/CallbackHandler.js

@@ -1,34 +1,24 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import logger from "loglevel";
-import { useEffect, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
-import { DeveloperHint } from "../../components/DeveloperHint.js";
-import { ErrorPage } from "../../components/ErrorPage.js";
-import { Spinner } from "../../components/Spinner.js";
-import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useSuspenseQuery } from "@tanstack/react-query";
+import { Navigate } from "react-router-dom";
+import { ZudokuError } from "../../util/invariant.js";
 export function CallbackHandler({ handleCallback, }) {
-    const [error, setError] = useState(null);
-    const navigate = useNavigate();
-    // Deal with double mount in dev mode which will break
-    // the OAuth flow because you can only use the code once
-    const didInitialize = useRef(false);
-    useEffect(() => {
-        if (didInitialize.current) {
-            return;
-        }
-        didInitialize.current = true;
-        handleCallback()
-            .then((redirect) => {
-            navigate(redirect);
-        })
-            .catch((err) => {
-            logger.error(err);
-            setError(err);
-        });
-    }, [navigate, handleCallback]);
-    if (error) {
-        return (_jsx(ErrorPage, { category: "Error", title: "Authentication Error", message: _jsxs(_Fragment, { children: [_jsx(DeveloperHint, { className: "mb-4", children: "Check the configuration of your authorization provider and ensure all settings such as the callback URL are configured correctly." }), "An error occurred while authorizing the user.", _jsx(SyntaxHighlight, { code: error.toString(), language: "plain" })] }) }));
-    }
-    return (_jsx("div", { className: "grid h-full place-items-center", children: _jsx(Spinner, {}) }));
+    const executeCallback = useSuspenseQuery({
+        retry: false,
+        queryKey: ["oauth-callback"],
+        queryFn: async () => {
+            try {
+                return await handleCallback();
+            }
+            catch (error) {
+                throw new ZudokuError("Could not validate user", {
+                    cause: error,
+                    title: "Authentication Error",
+                    developerHint: "Check the configuration of your authorization provider and ensure all settings such as the callback URL are configured correctly.",
+                });
+            }
+        },
+    });
+    return _jsx(Navigate, { to: executeCallback.data });
 }
 //# sourceMappingURL=CallbackHandler.js.map

package/dist/lib/authentication/components/CallbackHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"CallbackHandler.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/CallbackHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAEtE,MAAM,UAAU,eAAe,CAAC,EAC9B,cAAc,GAGf;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,IAAI,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,sDAAsD;IACtD,wDAAwD;IACxD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,cAAc,EAAE;aACb,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAE/B,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CACL,KAAC,SAAS,IACR,QAAQ,EAAC,OAAO,EAChB,KAAK,EAAC,sBAAsB,EAC5B,OAAO,EACL,8BACE,KAAC,aAAa,IAAC,SAAS,EAAC,MAAM,kJAGf,mDAEhB,KAAC,eAAe,IAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAC,OAAO,GAAG,IAC3D,GAEL,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,cAAK,SAAS,EAAC,gCAAgC,YAC7C,KAAC,OAAO,KAAG,GACP,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"CallbackHandler.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/CallbackHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,EAC9B,cAAc,GAGf;IACC,MAAM,eAAe,GAAG,gBAAgB,CAAC;QACvC,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,CAAC,gBAAgB,CAAC;QAC5B,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC;gBACH,OAAO,MAAM,cAAc,EAAE,CAAC;YAChC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,WAAW,CAAC,yBAAyB,EAAE;oBAC/C,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,sBAAsB;oBAC7B,aAAa,EACX,mIAAmI;iBACtI,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,KAAC,QAAQ,IAAC,EAAE,EAAE,eAAe,CAAC,IAAI,GAAI,CAAC;AAChD,CAAC"}

package/dist/lib/authentication/hook.d.ts

@@ -1,8 +1,9 @@
 export declare const useAuth: () => {
-    isAuthEnabled: boolean;
-    isPending: boolean;
-    profile: import("./state.js").UserProfile | undefined;
-    isAuthenticated: import("./state.js").UserProfile | undefined;
     login: () => Promise<void>;
     logout: () => Promise<void>;
+    isAuthenticated: boolean;
+    isPending: boolean;
+    profile: import("./state.js").UserProfile | null;
+    providerData: unknown;
+    isAuthEnabled: boolean;
 };

package/dist/lib/authentication/hook.js

@@ -6,9 +6,7 @@ export const useAuth = () => {
     const isAuthEnabled = typeof authentication !== "undefined";
     return {
         isAuthEnabled,
-        isPending: authState.isPending,
-        profile: authState.profile,
-        isAuthenticated: authState.profile,
+        ...authState,
         login: async () => {
             if (!isAuthEnabled) {
                 throw new Error("Authentication is not enabled.");

package/dist/lib/authentication/hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../src/lib/authentication/hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,OAAO,cAAc,KAAK,WAAW,CAAC;IAE5D,OAAO;QACL,aAAa;QACb,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,eAAe,EAAE,SAAS,CAAC,OAAO;QAElC,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,mCAAmC;YACnC,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,mCAAmC;YACnC,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;YAE/B,mBAAmB;YACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../src/lib/authentication/hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,OAAO,cAAc,KAAK,WAAW,CAAC;IAE5D,OAAO;QACL,aAAa;QACb,GAAG,SAAS;QAEZ,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,mCAAmC;YACnC,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,mCAAmC;YACnC,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;YAE/B,mBAAmB;YACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/authentication/providers/auth0.js

@@ -11,38 +11,39 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
         });
     }
     onAuthorizationUrl = async (url, { isSignUp }) => {
+        url.searchParams.set("prompt", "login");
         if (isSignUp) {
             url.searchParams.set("screen_hint", "signup");
         }
     };
     signOut = async () => {
+        const as = await this.getAuthServer();
+        const idToken = await this.getAccessToken();
         useAuthState.setState({
             isAuthenticated: false,
             isPending: false,
-            profile: undefined,
+            profile: null,
+            providerData: null,
         });
-        sessionStorage.clear();
-        const as = await this.getAuthServer();
         const redirectUrl = new URL(window.location.origin + this.logoutRedirectUrlPath);
         redirectUrl.pathname = this.logoutRedirectUrlPath;
         // SEE: https://auth0.com/docs/authenticate/login/logout/log-users-out-of-auth0
         // For Auth0 tenants created on or after 14 November 2023, RP-Initiated
         // Logout End Session Endpoint Discovery is enabled by default.
         // Otherwise we fallback to the old non-compliant logout
-        let logoutUrl;
         // The endSessionEndpoint is set, the IdP supports some form of logout,
         // so we use the IdP logout. Otherwise, just redirect the user to home
         if (as.end_session_endpoint) {
-            logoutUrl = new URL(as.end_session_endpoint);
-            // TODO: get id_token and set hint
-            // const { id_token } = session;
-            // if (id_token) {
-            //   logoutUrl.searchParams.set("id_token_hint", id_token);
-            // }
+            const logoutUrl = new URL(as.end_session_endpoint);
+            if (idToken) {
+                logoutUrl.searchParams.set("id_token_hint", idToken);
+            }
             logoutUrl.searchParams.set("post_logout_redirect_uri", redirectUrl.toString());
+            // window.location.href = logoutUrl.toString();
         }
         else {
-            logoutUrl = new URL(`${this.issuer}oidc/logout`);
+            const logoutUrl = new URL(`${this.issuer.replace(/\/$/, "")}/oidc/logout`);
+            // window.location.href = logoutUrl.toString();
         }
     };
 }

package/dist/lib/authentication/providers/auth0.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/auth0.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,2BAA4B,SAAQ,4BAA4B;IACpE,YAAY,MAAiC;QAC3C,KAAK,CAAC;YACJ,GAAG,MAAM;YACT,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW,MAAM,CAAC,MAAM,EAAE;YAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,GAAG,KAAK,EACxB,GAAQ,EACR,EAAE,QAAQ,EAAyB,EACnC,EAAE;QACF,IAAI,QAAQ,EAAE,CAAC;YACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,GAAG,KAAK,IAAmB,EAAE;QAClC,YAAY,CAAC,QAAQ,CAAC;YACpB,eAAe,EAAE,KAAK;YACtB,SAAS,EAAE,KAAK;YAChB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QACH,cAAc,CAAC,KAAK,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAEtC,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CACpD,CAAC;QACF,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAElD,+EAA+E;QAC/E,uEAAuE;QACvE,+DAA+D;QAC/D,wDAAwD;QAExD,IAAI,SAAc,CAAC;QACnB,uEAAuE;QACvE,sEAAsE;QACtE,IAAI,EAAE,CAAC,oBAAoB,EAAE,CAAC;YAC5B,SAAS,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;YAC7C,kCAAkC;YAClC,gCAAgC;YAChC,kBAAkB;YAClB,2DAA2D;YAC3D,IAAI;YACJ,SAAS,CAAC,YAAY,CAAC,GAAG,CACxB,0BAA0B,EAC1B,WAAW,CAAC,QAAQ,EAAE,CACvB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,aAAa,CAAC,CAAC;QACnD,CAAC;IACH,CAAC,CAAC;CACH;AAED,MAAM,SAAS,GAEX,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAE1D,eAAe,SAAS,CAAC"}
+{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/auth0.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,2BAA4B,SAAQ,4BAA4B;IACpE,YAAY,MAAiC;QAC3C,KAAK,CAAC;YACJ,GAAG,MAAM;YACT,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW,MAAM,CAAC,MAAM,EAAE;YAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,GAAG,KAAK,EACxB,GAAQ,EACR,EAAE,QAAQ,EAAyB,EACnC,EAAE;QACF,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,GAAG,KAAK,IAAmB,EAAE;QAClC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5C,YAAY,CAAC,QAAQ,CAAC;YACpB,eAAe,EAAE,KAAK;YACtB,SAAS,EAAE,KAAK;YAChB,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CACpD,CAAC;QAEF,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAElD,+EAA+E;QAC/E,uEAAuE;QACvE,+DAA+D;QAC/D,wDAAwD;QAExD,uEAAuE;QACvE,sEAAsE;QACtE,IAAI,EAAE,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;YACnD,IAAI,OAAO,EAAE,CAAC;gBACZ,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACvD,CAAC;YACD,SAAS,CAAC,YAAY,CAAC,GAAG,CACxB,0BAA0B,EAC1B,WAAW,CAAC,QAAQ,EAAE,CACvB,CAAC;YAEF,+CAA+C;QACjD,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAChD,CAAC;YACF,+CAA+C;QACjD,CAAC;IACH,CAAC,CAAC;CACH;AAED,MAAM,SAAS,GAEX,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAE1D,eAAe,SAAS,CAAC"}

package/dist/lib/authentication/providers/openid.d.ts

@@ -42,7 +42,6 @@ export declare class OpenIDAuthenticationProvider implements AuthenticationProvi
     getAccessToken(): Promise<string>;
     signOut: () => Promise<void>;
     handleCallback: () => Promise<string>;
-    pageLoad(): void;
     getAuthenticationPlugin(): OpenIdAuthPlugin;
 }
 declare const openIDAuth: AuthenticationProviderInitializer<OpenIDAuthenticationConfig>;

package/dist/lib/authentication/providers/openid.js

@@ -72,7 +72,9 @@ export class OpenIDAuthenticationProvider {
             expiresOn: new Date(Date.now() + response.expires_in * 1000),
             tokenType: response.token_type,
         };
-        sessionStorage.setItem("token-state", JSON.stringify(tokens));
+        useAuthState.setState({
+            providerData: tokens,
+        });
     }
     async signUp({ redirectTo } = {}) {
         return this.authorize({
@@ -132,17 +134,22 @@ export class OpenIDAuthenticationProvider {
     }
     async getAccessToken() {
         const as = await this.getAuthServer();
-        const tokenState = sessionStorage.getItem("token-state");
-        if (!tokenState) {
+        const { providerData } = useAuthState.getState();
+        if (!providerData) {
             throw new AuthorizationError("User is not authenticated");
         }
-        const state = JSON.parse(tokenState);
-        if (state.expiresOn < new Date()) {
-            if (!state.refreshToken) {
-                await this.signIn();
+        const tokenState = providerData;
+        if (new Date(tokenState.expiresOn) < new Date()) {
+            if (!tokenState.refreshToken) {
+                useAuthState.setState({
+                    isAuthenticated: false,
+                    isPending: false,
+                    profile: null,
+                    providerData: null,
+                });
                 return "";
             }
-            const request = await oauth.refreshTokenGrantRequest(as, this.client, state.refreshToken);
+            const request = await oauth.refreshTokenGrantRequest(as, this.client, tokenState.refreshToken);
             const response = await oauth.processRefreshTokenResponse(as, this.client, request);
             if (!response.access_token) {
                 throw new AuthorizationError("No access token in response");
@@ -151,7 +158,7 @@ export class OpenIDAuthenticationProvider {
             return response.access_token.toString();
         }
         else {
-            return state.accessToken;
+            return tokenState.accessToken;
         }
     }
     signOut = async () => {
@@ -159,8 +166,8 @@ export class OpenIDAuthenticationProvider {
             isAuthenticated: false,
             isPending: false,
             profile: undefined,
+            providerData: undefined,
         });
-        sessionStorage.clear();
         const as = await this.getAuthServer();
         const redirectUrl = new URL(window.location.origin + this.redirectToAfterSignOut);
         redirectUrl.pathname = this.logoutRedirectUrlPath;
@@ -225,27 +232,10 @@ export class OpenIDAuthenticationProvider {
             isPending: false,
             profile,
         });
-        sessionStorage.setItem("profile-state", JSON.stringify(useAuthState.getState().profile));
         const redirectTo = sessionStorage.getItem("redirect-to") ?? "/";
         sessionStorage.removeItem("redirect-to");
         return redirectTo;
     };
-    pageLoad() {
-        const profileState = sessionStorage.getItem("profile-state");
-        if (profileState) {
-            try {
-                const profile = JSON.parse(profileState);
-                useAuthState.setState({
-                    isAuthenticated: true,
-                    isPending: false,
-                    profile,
-                });
-            }
-            catch (err) {
-                logger.error("Error parsing auth state", err);
-            }
-        }
-    }
     getAuthenticationPlugin() {
         // TODO: This API is a bit messy, we need to refactor auth plugins/providers
         // to remove the extra layers of abstraction.