@sevenfold/setto-client 0.2.2 → 0.2.3

package/dist/setto-client.js

@@ -22661,23 +22661,23 @@ function adminRedirectUrl() {
 }
 function authCallbackType() {
   const hash = window.location.hash.replace(/^#/, "");
-  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;
+  if (!hash) return null;
+  const type = new URLSearchParams(hash).get("type");
+  if (type === "invite" || type === "recovery") return type;
   return null;
 }
-function inviteTokenHashFromUrl() {
-  return new URLSearchParams(window.location.search).get("token_hash");
+function clearAuthHashFromUrl() {
+  const { pathname, search } = window.location;
+  window.history.replaceState(null, "", pathname + search);
 }
-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 consumeInviteErrorFromUrl() {
+  const params = new URLSearchParams(window.location.search);
+  const code = params.get("setto_invite_error");
+  if (!code) return null;
+  params.delete("setto_invite_error");
+  const qs = params.toString();
+  window.history.replaceState(null, "", `${window.location.pathname}${qs ? `?${qs}` : ""}`);
+  return code === "invalid" ? "Invitasjonslenken er ugyldig eller utløpt. Be administratoren om en ny." : "Kunne ikke aktivere invitasjonen.";
 }
 function AuthGate({ children }) {
   const { supabase, session, authLoading } = useSetto();
@@ -22688,38 +22688,22 @@ 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 tokenHash = inviteTokenHashFromUrl();
-    const callbackType = authCallbackType();
-    if (!tokenHash || !callbackType) {
-      if (callbackType) setMode("set_password");
+    const inviteError = consumeInviteErrorFromUrl();
+    if (inviteError) {
+      setError(inviteError);
+      setMode("signin");
       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]);
+    const callback = authCallbackType();
+    if (callback) setMode("set_password");
+  }, []);
   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 || activatingInvite) {
-    return /* @__PURE__ */ jsx("div", { style: loadingStyle, children: activatingInvite || authCallbackType() ? "Aktiverer invitasjon …" : "Åpne lenken fra e-posten for å sette passord." });
+  if (mode === "set_password" && !session) {
+    return /* @__PURE__ */ jsx("div", { style: loadingStyle, children: authCallbackType() ? "Aktiverer invitasjon …" : "Åpne lenken fra e-posten for å sette passord." });
   }
   const submitSignIn = async (e) => {
     e.preventDefault();
@@ -22774,7 +22758,7 @@ function AuthGate({ children }) {
     try {
       const { error: updateError } = await supabase.auth.updateUser({ password });
       if (updateError) throw updateError;
-      clearAuthParamsFromUrl();
+      clearAuthHashFromUrl();
       const { data: sessionData } = await supabase.auth.getSession();
       if (sessionData.session) {
         window.location.replace(editModeUrl());