zudoku 0.0.0-f01b653 → 0.0.0-f06d326

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export type { MDXImport } from "./lib/plugins/markdown/index.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";
+export { useEvent } from "./lib/hooks/index.js";

package/dist/index.js

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

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAoB,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAoB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/lib/MissingIcon.d.ts

@@ -0,0 +1,2 @@
+import { LucideProps } from "lucide-react";
+export declare const MissingIcon: (props: LucideProps) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/MissingIcon.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { CircleDashed } from "lucide-react";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "./ui/Tooltip.js";
+export const MissingIcon = (props) => {
+    return (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { className: "text-red-500", children: _jsx(CircleDashed, { ...props }) }), _jsx(TooltipContent, { children: "Icon not found, see: https://lucide.dev/icons/" })] }) }));
+};
+//# sourceMappingURL=MissingIcon.js.map

package/dist/lib/MissingIcon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MissingIcon.js","sourceRoot":"","sources":["../../src/lib/MissingIcon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,OAAO,EACP,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAkB,EAAE,EAAE;IAChD,OAAO,CACL,KAAC,eAAe,cACd,MAAC,OAAO,eACN,KAAC,cAAc,IAAC,SAAS,EAAC,cAAc,YACtC,KAAC,YAAY,OAAK,KAAK,GAAI,GACZ,EACjB,KAAC,cAAc,iEAEE,IACT,GACM,CACnB,CAAC;AACJ,CAAC,CAAC"}

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

@@ -10,6 +10,7 @@ export interface AuthenticationProvider {
     getAccessToken(): Promise<string>;
     getAuthenticationPlugin?(): ZudokuPlugin;
     onPageLoad?(): void;
+    signRequest(request: Request): Promise<Request>;
 }
 export interface AuthenticationProviderInitializer<TConfig> {
     (config: TConfig): AuthenticationProvider;

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

@@ -6,7 +6,7 @@ export const SignOut = () => {
     const navigate = useNavigate();
     useEffect(() => {
         void context.authentication?.signOut().then(() => navigate("/"));
-    }, [navigate, context.authentication]);
+    }, []);
     return null;
 };
 //# sourceMappingURL=SignOut.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SignOut.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/SignOut.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAEtE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAEvC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"SignOut.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/SignOut.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAEtE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

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

@@ -1,6 +1,7 @@
 export declare const useAuth: () => {
     login: () => Promise<void>;
     logout: () => Promise<void>;
+    signup: () => Promise<void>;
     isAuthenticated: boolean;
     isPending: boolean;
     profile: import("./state.js").UserProfile | null;

package/dist/lib/authentication/hook.js

@@ -12,7 +12,9 @@ export const useAuth = () => {
                 throw new Error("Authentication is not enabled.");
             }
             // TODO: Should handle errors/state
-            await authentication.signIn();
+            await authentication.signIn({
+                redirectTo: window.location.href,
+            });
         },
         logout: async () => {
             if (!isAuthEnabled) {
@@ -23,6 +25,14 @@ export const useAuth = () => {
             // Redirect to home
             window.location.href = "/";
         },
+        signup: async () => {
+            if (!isAuthEnabled) {
+                throw new Error("Authentication is not enabled.");
+            }
+            await authentication.signUp({
+                redirectTo: window.location.href,
+            });
+        },
     };
 };
 //# sourceMappingURL=hook.js.map

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,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"}
+{"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,CAAC;gBAC1B,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;aACjC,CAAC,CAAC;QACL,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;QAED,MAAM,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,cAAc,CAAC,MAAM,CAAC;gBAC1B,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;aACjC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { Auth0AuthenticationConfig } from "../../../config/config.js";
-import { AuthenticationProviderInitializer } from "../authentication.js";
+import { type Auth0AuthenticationConfig } from "../../../config/config.js";
+import { type AuthenticationProviderInitializer } from "../authentication.js";
 declare const auth0Auth: AuthenticationProviderInitializer<Auth0AuthenticationConfig>;
 export default auth0Auth;

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

@@ -8,6 +8,7 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
             issuer: `https://${config.domain}`,
             clientId: config.clientId,
             audience: config.audience,
+            scopes: config.scopes,
         });
     }
     onAuthorizationUrl = async (url, { isSignUp }) => {
@@ -25,7 +26,7 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
             profile: null,
             providerData: null,
         });
-        const redirectUrl = new URL(window.location.origin + this.logoutRedirectUrlPath);
+        const redirectUrl = new URL(window.location.origin);
         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

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,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"}
+{"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;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,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,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,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/clerk.d.ts

@@ -1,4 +1,4 @@
-import { ClerkAuthenticationConfig } from "../../../config/config.js";
-import { AuthenticationProviderInitializer } from "../authentication.js";
+import { type ClerkAuthenticationConfig } from "../../../config/config.js";
+import { type AuthenticationProviderInitializer } from "../authentication.js";
 declare const clerkAuth: AuthenticationProviderInitializer<ClerkAuthenticationConfig>;
 export default clerkAuth;

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

@@ -12,16 +12,21 @@ class ClerkAuthPlugin extends AuthenticationPlugin {
             return;
         }
         if (clerk.session) {
+            const verifiedEmail = clerk.session.user.emailAddresses.find((email) => email.verification.status === "verified");
             useAuthState.setState({
                 isAuthenticated: true,
                 isPending: false,
                 profile: {
                     sub: clerk.session.user.id,
                     name: clerk.session.user.fullName ?? undefined,
-                    email: clerk.session.user.emailAddresses[0]?.emailAddress,
-                    emailVerified: false, // TODO: Check this
+                    email: verifiedEmail?.emailAddress ??
+                        clerk.session.user.emailAddresses[0]?.emailAddress,
+                    emailVerified: verifiedEmail !== undefined,
                     pictureUrl: clerk.session.user.imageUrl,
                 },
+                providerData: {
+                    user: clerk.session.user,
+                },
             });
         }
         else {
@@ -41,11 +46,35 @@ const clerkAuth = ({ clerkPubKey, redirectToAfterSignOut = "/", redirectToAfterS
         const { Clerk } = await import("@clerk/clerk-js");
         clerkApi = new Clerk(clerkPubKey);
         await clerkApi.load();
+        if (clerkApi.user) {
+            const verifiedEmail = clerkApi.user.emailAddresses.find((email) => email.verification.status === "verified");
+            useAuthState.setState({
+                isAuthenticated: true,
+                isPending: false,
+                profile: {
+                    sub: clerkApi.user.id,
+                    name: clerkApi.user.fullName ?? undefined,
+                    email: verifiedEmail?.emailAddress ??
+                        clerkApi.user.emailAddresses[0]?.emailAddress,
+                    emailVerified: verifiedEmail !== undefined,
+                    pictureUrl: clerkApi.user.imageUrl,
+                },
+                providerData: {
+                    user: {
+                        publicMetadata: clerkApi.user.publicMetadata,
+                        id: clerkApi.user.id,
+                        emailAddresses: clerkApi.user.emailAddresses,
+                        imageUrl: clerkApi.user.imageUrl,
+                        fullName: clerkApi.user.fullName,
+                    },
+                },
+            });
+        }
         return clerkApi;
     })();
     async function getAccessToken() {
         await ensureLoaded;
-        if (!clerkApi.session) {
+        if (!clerkApi?.session) {
             throw new Error("No session available");
         }
         const response = await clerkApi.session.getToken();
@@ -54,26 +83,39 @@ const clerkAuth = ({ clerkPubKey, redirectToAfterSignOut = "/", redirectToAfterS
         }
         return response;
     }
+    async function signRequest(request) {
+        const response = await getAccessToken();
+        request.headers.set("Authorization", `Bearer ${response}`);
+        return request;
+    }
     return {
+        clerk: clerkApi,
         getAccessToken,
+        signRequest,
         signOut: async () => {
             await ensureLoaded;
-            await clerkApi.signOut({
+            await clerkApi?.signOut({
                 redirectUrl: window.location.origin + redirectToAfterSignOut,
             });
+            useAuthState.setState({
+                isAuthenticated: false,
+                isPending: false,
+                profile: null,
+                providerData: null,
+            });
         },
-        signIn: async () => {
+        signIn: async ({ redirectTo }) => {
             await ensureLoaded;
-            await clerkApi.redirectToSignIn({
-                signInForceRedirectUrl: window.location.origin + redirectToAfterSignIn,
-                signUpForceRedirectUrl: window.location.origin + redirectToAfterSignUp,
+            await clerkApi?.redirectToSignIn({
+                signInForceRedirectUrl: redirectTo ?? window.location.origin + redirectToAfterSignIn,
+                signUpForceRedirectUrl: redirectTo ?? window.location.origin + redirectToAfterSignUp,
             });
         },
-        signUp: async () => {
+        signUp: async ({ redirectTo }) => {
             await ensureLoaded;
-            await clerkApi.redirectToSignUp({
-                signInForceRedirectUrl: window.location.origin + redirectToAfterSignIn,
-                signUpForceRedirectUrl: window.location.origin + redirectToAfterSignUp,
+            await clerkApi?.redirectToSignUp({
+                signInForceRedirectUrl: redirectTo ?? window.location.origin + redirectToAfterSignIn,
+                signUpForceRedirectUrl: redirectTo ?? window.location.origin + redirectToAfterSignUp,
             });
         },
         getAuthenticationPlugin() {

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

@@ -1 +1 @@
-{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/clerk.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/clerk.tsx"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,14 @@
 import * as oauth from "oauth4webapi";
-import { OpenIDAuthenticationConfig } from "../../../config/config.js";
-import { AuthenticationProvider, AuthenticationProviderInitializer } from "../authentication.js";
+import { type OpenIDAuthenticationConfig } from "../../../config/config.js";
+import { type AuthenticationProvider, type AuthenticationProviderInitializer } from "../authentication.js";
 import { AuthenticationPlugin } from "../AuthenticationPlugin.js";
+export interface OpenIdProviderData {
+    accessToken: string;
+    idToken?: string;
+    refreshToken?: string;
+    expiresOn: Date;
+    tokenType: string;
+}
 declare class OpenIdAuthPlugin extends AuthenticationPlugin {
     private callbackUrlPath;
     private handleCallback;
@@ -25,7 +32,8 @@ export declare class OpenIDAuthenticationProvider implements AuthenticationProvi
     private readonly redirectToAfterSignIn;
     private readonly redirectToAfterSignOut;
     private readonly audience?;
-    constructor({ issuer, audience, clientId, redirectToAfterSignUp, redirectToAfterSignIn, redirectToAfterSignOut, }: OpenIDAuthenticationConfig);
+    private readonly scopes;
+    constructor({ issuer, audience, clientId, redirectToAfterSignUp, redirectToAfterSignIn, redirectToAfterSignOut, basePath, scopes, }: OpenIDAuthenticationConfig);
     protected getAuthServer(): Promise<oauth.AuthorizationServer>;
     /**
      * Sets the tokens from various OAuth responses
@@ -40,6 +48,7 @@ export declare class OpenIDAuthenticationProvider implements AuthenticationProvi
     }): Promise<void>;
     private authorize;
     getAccessToken(): Promise<string>;
+    signRequest: (request: Request) => Promise<Request>;
     signOut: () => Promise<void>;
     handleCallback: () => Promise<string>;
     getAuthenticationPlugin(): OpenIdAuthPlugin;

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

@@ -1,11 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import logger from "loglevel";
 import * as oauth from "oauth4webapi";
+import { ClientOnly } from "../../components/ClientOnly.js";
+import { joinUrl } from "../../util/joinUrl.js";
 import { AuthenticationPlugin } from "../AuthenticationPlugin.js";
 import { CallbackHandler } from "../components/CallbackHandler.js";
 import { AuthorizationError, OAuthAuthorizationError } from "../errors.js";
 import { useAuthState } from "../state.js";
 const CODE_VERIFIER_KEY = "code-verifier";
+const STATE_KEY = "oauth-state";
 class OpenIdAuthPlugin extends AuthenticationPlugin {
     callbackUrlPath;
     handleCallback;
@@ -19,7 +22,7 @@ class OpenIdAuthPlugin extends AuthenticationPlugin {
             ...super.getRoutes(),
             {
                 path: this.callbackUrlPath,
-                element: _jsx(CallbackHandler, { handleCallback: this.handleCallback }),
+                element: (_jsx(ClientOnly, { children: _jsx(CallbackHandler, { handleCallback: this.handleCallback }) })),
             },
         ];
     }
@@ -28,23 +31,28 @@ export class OpenIDAuthenticationProvider {
     client;
     issuer;
     authorizationServer;
-    callbackUrlPath = "/oauth/callback";
-    logoutRedirectUrlPath = "/";
+    callbackUrlPath;
+    logoutRedirectUrlPath;
     onAuthorizationUrl;
     redirectToAfterSignUp;
     redirectToAfterSignIn;
     redirectToAfterSignOut;
     audience;
-    constructor({ issuer, audience, clientId, redirectToAfterSignUp, redirectToAfterSignIn, redirectToAfterSignOut, }) {
+    scopes;
+    constructor({ issuer, audience, clientId, redirectToAfterSignUp, redirectToAfterSignIn, redirectToAfterSignOut, basePath, scopes, }) {
         this.client = {
             client_id: clientId,
             token_endpoint_auth_method: "none",
         };
         this.audience = audience;
         this.issuer = issuer;
-        this.redirectToAfterSignUp = redirectToAfterSignUp ?? "/";
-        this.redirectToAfterSignIn = redirectToAfterSignIn ?? "/";
-        this.redirectToAfterSignOut = redirectToAfterSignOut ?? "/";
+        this.callbackUrlPath = joinUrl(basePath, "/oauth/callback");
+        this.scopes = scopes ?? ["openid", "profile", "email"];
+        const root = joinUrl(basePath, "/");
+        this.logoutRedirectUrlPath = root;
+        this.redirectToAfterSignUp = redirectToAfterSignUp ?? root;
+        this.redirectToAfterSignIn = redirectToAfterSignIn ?? root;
+        this.redirectToAfterSignOut = redirectToAfterSignOut ?? root;
     }
     async getAuthServer() {
         if (!this.authorizationServer) {
@@ -69,6 +77,7 @@ export class OpenIDAuthenticationProvider {
         const tokens = {
             accessToken: response.access_token,
             refreshToken: response.refresh_token,
+            idToken: response.id_token,
             expiresOn: new Date(Date.now() + response.expires_in * 1000),
             tokenType: response.token_type,
         };
@@ -103,14 +112,17 @@ export class OpenIDAuthenticationProvider {
         sessionStorage.setItem(CODE_VERIFIER_KEY, codeVerifier);
         // redirect user to as.authorization_endpoint
         const authorizationUrl = new URL(authorizationServer.authorization_endpoint);
-        sessionStorage.setItem("redirect-to", redirectTo);
+        const finalRedirect = redirectTo.startsWith(window.location.origin)
+            ? redirectTo.slice(window.location.origin.length)
+            : redirectTo;
+        sessionStorage.setItem("redirect-to", finalRedirect);
         const redirectUrl = new URL(window.location.origin);
         redirectUrl.pathname = this.callbackUrlPath;
         redirectUrl.search = "";
         authorizationUrl.searchParams.set("client_id", this.client.client_id);
         authorizationUrl.searchParams.set("redirect_uri", redirectUrl.toString());
         authorizationUrl.searchParams.set("response_type", "code");
-        authorizationUrl.searchParams.set("scope", "openid profile email");
+        authorizationUrl.searchParams.set("scope", this.scopes.join(" "));
         authorizationUrl.searchParams.set("code_challenge", codeChallenge);
         authorizationUrl.searchParams.set("code_challenge_method", code_challenge_method);
         if (this.audience) {
@@ -121,14 +133,12 @@ export class OpenIDAuthenticationProvider {
             isSignUp,
         });
         /**
-         * We cannot be sure the AS supports PKCE so we're going to use state too. Use of PKCE is
-         * backwards compatible even if the AS doesn't support it which is why we're using it regardless.
+         * The state parameter is used to prevent CSRF attacks and should be used in all authorization requests.
+         * It is independent of PKCE and should be used regardless of PKCE support.
          */
-        if (authorizationServer.code_challenge_methods_supported?.includes("S256") !==
-            true) {
-            const state = oauth.generateRandomState();
-            authorizationUrl.searchParams.set("state", state);
-        }
+        const state = oauth.generateRandomState();
+        sessionStorage.setItem(STATE_KEY, state);
+        authorizationUrl.searchParams.set("state", state);
         // now redirect the user to authorizationUrl.href
         location.href = authorizationUrl.href;
     }
@@ -161,6 +171,11 @@ export class OpenIDAuthenticationProvider {
             return tokenState.accessToken;
         }
     }
+    signRequest = async (request) => {
+        const accessToken = await this.getAccessToken();
+        request.headers.set("Authorization", `Bearer ${accessToken}`);
+        return request;
+    };
     signOut = async () => {
         useAuthState.setState({
             isAuthenticated: false,
@@ -190,6 +205,11 @@ export class OpenIDAuthenticationProvider {
     handleCallback = async () => {
         const url = new URL(window.location.href);
         const state = url.searchParams.get("state");
+        const storedState = sessionStorage.getItem(STATE_KEY);
+        sessionStorage.removeItem(STATE_KEY);
+        if (state !== storedState) {
+            throw new AuthorizationError("Invalid state parameter");
+        }
         // one eternity later, the user lands back on the redirect_uri
         // Authorization Code Grant Request & Response
         const codeVerifier = sessionStorage.getItem(CODE_VERIFIER_KEY);
@@ -204,7 +224,7 @@ export class OpenIDAuthenticationProvider {
             throw new OAuthAuthorizationError("Error validating OAuth response", params);
         }
         const redirectUrl = new URL(url);
-        redirectUrl.pathname = this.redirectToAfterSignIn;
+        redirectUrl.pathname = this.callbackUrlPath;
         redirectUrl.search = "";
         const response = await oauth.authorizationCodeGrantRequest(authServer, this.client, params, redirectUrl.toString(), codeVerifier);
         // TODO: do we need to do these

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

@@ -1 +1 @@
-{"version":3,"file":"openid.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/openid.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"openid.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/openid.tsx"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,4 @@
+import { type SupabaseAuthenticationConfig } from "../../../config/config.js";
+import { type AuthenticationProviderInitializer } from "../authentication.js";
+declare const supabaseAuth: AuthenticationProviderInitializer<SupabaseAuthenticationConfig>;
+export default supabaseAuth;

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

@@ -0,0 +1,117 @@
+import { createClient, } from "@supabase/supabase-js";
+import { AuthenticationPlugin } from "../AuthenticationPlugin.js";
+import { AuthorizationError } from "../errors.js";
+import { useAuthState } from "../state.js";
+class SupabaseAuthPlugin extends AuthenticationPlugin {
+}
+class SupabaseAuthenticationProvider {
+    client;
+    provider;
+    redirectToAfterSignUp;
+    redirectToAfterSignIn;
+    redirectToAfterSignOut;
+    constructor({ supabaseUrl, supabaseKey, provider, redirectToAfterSignUp, redirectToAfterSignIn, redirectToAfterSignOut, basePath, }) {
+        this.provider = provider;
+        this.client = createClient(supabaseUrl, supabaseKey, {
+            auth: {
+                autoRefreshToken: true,
+                persistSession: true,
+            },
+        });
+        const root = basePath ?? "/";
+        this.redirectToAfterSignUp = redirectToAfterSignUp ?? root;
+        this.redirectToAfterSignIn = redirectToAfterSignIn ?? root;
+        this.redirectToAfterSignOut = redirectToAfterSignOut ?? root;
+        this.client.auth.onAuthStateChange(async (event, session) => {
+            if (session && (event === "SIGNED_IN" || event === "TOKEN_REFRESHED")) {
+                await this.updateUserState(session);
+            }
+            else if (event === "SIGNED_OUT") {
+                useAuthState.setState({
+                    isAuthenticated: false,
+                    isPending: false,
+                    profile: undefined,
+                    providerData: undefined,
+                });
+            }
+        });
+    }
+    async updateUserState(session) {
+        const { user } = session;
+        const profile = {
+            sub: user.id,
+            email: user.email,
+            name: user.user_metadata.full_name || user.user_metadata.name,
+            emailVerified: user.email_confirmed_at != null,
+            pictureUrl: user.user_metadata.avatar_url,
+        };
+        useAuthState.setState({
+            isAuthenticated: true,
+            isPending: false,
+            profile,
+            providerData: { session },
+        });
+    }
+    async getAccessToken() {
+        const { data, error } = await this.client.auth.getSession();
+        if (error || !data.session) {
+            throw new AuthorizationError("User is not authenticated");
+        }
+        return data.session.access_token;
+    }
+    async signRequest(request) {
+        const accessToken = await this.getAccessToken();
+        request.headers.set("Authorization", `Bearer ${accessToken}`);
+        return request;
+    }
+    signUp = async ({ redirectTo }) => {
+        const finalRedirectTo = redirectTo ?? this.redirectToAfterSignUp;
+        // Open Supabase Auth UI in a new window
+        await this.client.auth.signInWithOAuth({
+            provider: this.provider,
+            options: {
+                redirectTo: window.location.origin + finalRedirectTo,
+            },
+        });
+    };
+    signIn = async ({ redirectTo }) => {
+        const finalRedirectTo = redirectTo ?? this.redirectToAfterSignIn;
+        await this.client.auth.signInWithOAuth({
+            provider: this.provider,
+            options: {
+                redirectTo: window.location.origin + finalRedirectTo,
+                queryParams: {
+                    access_type: "offline",
+                    prompt: "consent",
+                },
+            },
+        });
+    };
+    signOut = async () => {
+        await new Promise((resolve) => {
+            const { data } = this.client.auth.onAuthStateChange(async (event) => {
+                if (event !== "SIGNED_OUT")
+                    return;
+                data.subscription.unsubscribe();
+                resolve();
+            });
+            void this.client.auth.signOut();
+        });
+        useAuthState.setState({
+            isAuthenticated: false,
+            isPending: false,
+            profile: undefined,
+            providerData: undefined,
+        });
+    };
+    getAuthenticationPlugin = () => new SupabaseAuthPlugin();
+    onPageLoad = async () => {
+        const { data, error } = await this.client.auth.getSession();
+        if (!error && data.session) {
+            await this.updateUserState(data.session);
+        }
+    };
+}
+const supabaseAuth = (options) => new SupabaseAuthenticationProvider(options);
+export default supabaseAuth;
+//# sourceMappingURL=supabase.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/supabase.tsx"],"names":[],"mappings":"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"}