@sevenfold/setto-client 0.2.0 → 0.2.2

package/dist/admin/App.d.ts

@@ -2,11 +2,10 @@
  * Drop-in admin SPA. Mount under a route like `<Route path="/admin/*" .../>`.
  *
  * Behaviour after login:
- *  - Lists sites the user is a member of (read via Supabase RLS).
- *  - Single-site sites: redirect to `/?setto=edit` automatically.
- *  - Multi-site: show a picker.
+ *  - Redirects to `/?setto=edit` on the site home (edit mode active).
+ *  - Shows the dashboard only when the user lacks access to this site, or on
+ *    `/admin?deployment=…` for publish progress / history.
  *
- * While the user is on `/admin`, this component shows the site dashboard.
- * Editing happens on the public site at `/?setto=edit` via "Begynn å redigere".
+ * Editing happens on the public site at `/?setto=edit`.
  */
 export declare function SettoAdminApp(): import("react/jsx-runtime").JSX.Element;

package/dist/lib/urls.d.ts

@@ -0,0 +1,6 @@
+/** Site home with inline edit mode active. */
+export declare function editModeUrl(pathname?: string): string;
+export declare function isAdminRoute(): boolean;
+/** Admin deployment progress panel (`/admin?deployment=…`). */
+export declare function isAdminDeploymentView(): boolean;
+export declare function adminRedirectUrl(): string;

package/dist/setto-client.js

@@ -22643,19 +22643,41 @@ const SettoBlock = forwardRef(
     );
   }
 );
+function editModeUrl(pathname = "/") {
+  const u = new URL(window.location.href);
+  u.pathname = pathname;
+  u.search = "";
+  u.searchParams.set("setto", "edit");
+  return u.toString();
+}
+function isAdminRoute() {
+  return window.location.pathname.startsWith("/admin");
+}
+function isAdminDeploymentView() {
+  return isAdminRoute() && new URLSearchParams(window.location.search).has("deployment");
+}
 function adminRedirectUrl() {
   return `${window.location.origin}/admin`;
 }
 function authCallbackType() {
   const hash = window.location.hash.replace(/^#/, "");
-  if (!hash) return null;
-  const type = new URLSearchParams(hash).get("type");
-  if (type === "invite" || type === "recovery") return type;
+  if (hash) {
+    const type = new URLSearchParams(hash).get("type");
+    if (type === "invite" || type === "recovery") return type;
+  }
+  const queryType = new URLSearchParams(window.location.search).get("type");
+  if (queryType === "invite" || queryType === "recovery") return queryType;
   return null;
 }
-function clearAuthHashFromUrl() {
-  const { pathname, search } = window.location;
-  window.history.replaceState(null, "", pathname + search);
+function inviteTokenHashFromUrl() {
+  return new URLSearchParams(window.location.search).get("token_hash");
+}
+function clearAuthParamsFromUrl() {
+  const url = new URL(window.location.href);
+  url.hash = "";
+  url.searchParams.delete("token_hash");
+  url.searchParams.delete("type");
+  window.history.replaceState(null, "", `${url.pathname}${url.search}`);
 }
 function AuthGate({ children }) {
   const { supabase, session, authLoading } = useSetto();
@@ -22666,16 +22688,38 @@ function AuthGate({ children }) {
   const [error, setError] = useState(null);
   const [info, setInfo] = useState(null);
   const [busy, setBusy] = useState(false);
+  const [activatingInvite, setActivatingInvite] = useState(false);
   useEffect(() => {
-    const callback = authCallbackType();
-    if (callback) setMode("set_password");
-  }, []);
+    const tokenHash = inviteTokenHashFromUrl();
+    const callbackType = authCallbackType();
+    if (!tokenHash || !callbackType) {
+      if (callbackType) setMode("set_password");
+      return;
+    }
+    let cancelled = false;
+    setActivatingInvite(true);
+    void supabase.auth.verifyOtp({ token_hash: tokenHash, type: callbackType }).then(({ error: verifyError }) => {
+      if (cancelled) return;
+      clearAuthParamsFromUrl();
+      if (verifyError) {
+        setError(verifyError.message);
+        setMode("signin");
+        return;
+      }
+      setMode("set_password");
+    }).finally(() => {
+      if (!cancelled) setActivatingInvite(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [supabase]);
   if (authLoading) {
     return /* @__PURE__ */ jsx("div", { style: loadingStyle, children: "Laster …" });
   }
   if (session && mode !== "set_password") return /* @__PURE__ */ jsx(Fragment, { children });
-  if (mode === "set_password" && !session) {
-    return /* @__PURE__ */ jsx("div", { style: loadingStyle, children: authCallbackType() ? "Aktiverer invitasjon …" : "Åpne lenken fra e-posten for å sette passord." });
+  if (mode === "set_password" && !session || activatingInvite) {
+    return /* @__PURE__ */ jsx("div", { style: loadingStyle, children: activatingInvite || authCallbackType() ? "Aktiverer invitasjon …" : "Åpne lenken fra e-posten for å sette passord." });
   }
   const submitSignIn = async (e) => {
     e.preventDefault();
@@ -22730,7 +22774,12 @@ function AuthGate({ children }) {
     try {
       const { error: updateError } = await supabase.auth.updateUser({ password });
       if (updateError) throw updateError;
-      clearAuthHashFromUrl();
+      clearAuthParamsFromUrl();
+      const { data: sessionData } = await supabase.auth.getSession();
+      if (sessionData.session) {
+        window.location.replace(editModeUrl());
+        return;
+      }
       setMode("signin");
       setPassword("");
       setConfirmPassword("");
@@ -22921,6 +22970,15 @@ function SiteList() {
   const { supabase, session, config } = useSetto();
   const [sites, setSites] = useState(null);
   const [error, setError] = useState(null);
+  const redirectAfterSignIn = useRef(false);
+  useEffect(() => {
+    const { data: sub } = supabase.auth.onAuthStateChange((event) => {
+      if (event === "SIGNED_IN" && !isAdminDeploymentView()) {
+        redirectAfterSignIn.current = true;
+      }
+    });
+    return () => sub.subscription.unsubscribe();
+  }, [supabase]);
   useEffect(() => {
     if (!session) return;
     let cancelled = false;
@@ -22941,6 +22999,20 @@ function SiteList() {
     () => sites?.find((s) => s.id === config.siteId) ?? null,
     [sites, config.siteId]
   );
+  useEffect(() => {
+    if (!redirectAfterSignIn.current || !session || sites === null || isAdminDeploymentView()) {
+      return;
+    }
+    if (currentSite) {
+      redirectAfterSignIn.current = false;
+      window.location.replace(editModeUrl());
+      return;
+    }
+    redirectAfterSignIn.current = false;
+  }, [session, sites, currentSite]);
+  if (redirectAfterSignIn.current && session && (sites === null || currentSite)) {
+    return /* @__PURE__ */ jsx("div", { style: loadingRedirectStyle, children: "Åpner redigering …" });
+  }
   return /* @__PURE__ */ jsxs("div", { style: shellStyle, children: [
     /* @__PURE__ */ jsxs("header", { style: headerStyle, children: [
       /* @__PURE__ */ jsx("h1", { style: { margin: 0, fontSize: 22 }, children: "Setto" }),
@@ -23115,11 +23187,18 @@ function SignOutButton() {
   return /* @__PURE__ */ jsx("button", { onClick: () => supabase.auth.signOut(), style: signOutBtnStyle, children: "Logg ut" });
 }
 function editUrl() {
-  const u = new URL(window.location.href);
-  u.pathname = "/";
-  u.searchParams.set("setto", "edit");
-  return u.toString();
+  return editModeUrl("/");
 }
+const loadingRedirectStyle = {
+  minHeight: "100dvh",
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  background: "#0a0a0d",
+  color: "#888",
+  fontSize: 14,
+  fontFamily: 'system-ui, -apple-system, "Segoe UI", sans-serif'
+};
 const shellStyle = {
   minHeight: "100dvh",
   background: "#0a0a0d",