@wix/himalaya-cli 0.982.0 → 0.984.0

package/templates/yoga-studio/tier5-src/himi-store-account/index.ts

@@ -8,7 +8,7 @@
 // `wix-site-id` header and nothing else, so every read stayed on the baked site while the
 // UI claimed otherwise. Managing several businesses is Owner Lite's job (account auth, a
 // real Sites List, and per-call site scope via `site.forSite`).
-import { defineService } from "@himalaya/state";
+import { defineService, navigate, type NavDirective } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
@@ -21,6 +21,9 @@ interface AuthRouteInput {
   returnId?: string;
 }
 
+// The screen's boot input survives refresh; consuming it must survive too.
+let routeInputConsumed = false;
+
 /** Mid-flow open params land on `himalaya.input` (paramKeys on himi_account). */
 function routeInput(): AuthRouteInput {
   const input = (globalThis as { himalaya?: { input?: AuthRouteInput } }).himalaya?.input;
@@ -35,7 +38,7 @@ function strField(arg: unknown, key: string): string {
 
 /** Mid-flow auth (UX F3): intent + return path from himi.open / himalaya.input. */
 function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId">): Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId"> {
-  const route = routeInput();
+  const route = routeInputConsumed ? {} : routeInput();
   return {
     authIntent: strField(arg, "intent") || route.intent || prev.authIntent || "",
     authContextName: strField(arg, "contextName") || route.contextName || prev.authContextName || "",
@@ -44,6 +47,42 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** Where a successful sign-in returns to, or null. Never Account itself — that would
+ *  only push a second copy of the screen the member is already on. */
+function resumeTarget(s: Pick<S, "returnScreenId" | "returnId">): NavDirective | null {
+  if (!s.returnScreenId || s.returnScreenId === "himi_account") return null;
+  return s.returnId ? { screenId: s.returnScreenId, args: { id: s.returnId } } : { screenId: s.returnScreenId };
+}
+
+/** Resume the member-only screen that sent the visitor here, once. The return path is
+ *  consumed so a later refresh cannot fire it again; the host opens the target only if
+ *  it is linkable, the same check an authored `himi.open` gets. */
+function resumeAfterAuth(next: S): S {
+  const target = resumeTarget(next);
+  if (!next.isMember || !target) return next;
+  routeInputConsumed = true;
+  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "" }), target);
+}
+
+// Actions are not serialized: two quick Sign in taps both run against the pre-tap
+// state, so without this both would submit credentials and both would resume.
+let authInFlight = false;
+
+async function authenticate(s: S, submit: () => Promise<unknown>, notMemberMessage: string, failedMessage: string): Promise<S | undefined> {
+  if (authInFlight) return undefined;
+  authInFlight = true;
+  try {
+    await submit();
+    const next = await probe(optimisticMember(s, s.email));
+    if (!next.isMember) return derive({ ...next, message: notMemberMessage });
+    return resumeAfterAuth(derive({ ...next, message: "" }));
+  } catch {
+    return derive({ ...s, message: failedMessage });
+  } finally {
+    authInFlight = false;
+  }
+}
+
 // Next value of a focus token: monotonic, and never empty once requested. A counter
 // rather than Date.now() — deterministic under test, and immune to two focus
 // requests landing inside the same millisecond.
@@ -123,7 +162,8 @@ interface S {
   authContextName: string;
   returnScreenId: string;
   returnId: string;
-  /** Show Continue after a successful mid-flow sign-in. */
+  /** Show Continue when an already-signed-in member opens Account with a return path.
+   *  A sign-in made here resumes on its own (resumeAfterAuth). */
   hasReturnPath: boolean;
   noReturnPath: boolean;
   returnCta: string;
@@ -296,8 +336,8 @@ const svc = defineService<S, {
   showSignIn: (s: S) => S;
   showRecovery: (s: S) => S;
   resetPassword: (s: S) => Promise<S>;
-  signIn: (s: S) => Promise<S>;
-  register: (s: S) => Promise<S>;
+  signIn: (s: S) => Promise<S | undefined>;
+  register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
 }>("himiStoreAccount", {
   state: derive({
@@ -381,30 +421,29 @@ const svc = defineService<S, {
     },
     signIn: async (s) => {
       if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      try {
-        await dispatch("himi.wix.signInDirect", { email: s.email, password: s.password });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.signInFailed", "Sign in failed. Try again.") });
-      }
+      return authenticate(
+        s,
+        () => dispatch("himi.wix.signInDirect", { email: s.email, password: s.password }),
+        copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details."),
+        copyParam("storeAccount.signInFailed", "Sign in failed. Try again."),
+      );
     },
     register: async (s) => {
       if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      try {
-        await dispatch("himi.wix.registerDirect", {
+      return authenticate(
+        s,
+        () => dispatch("himi.wix.registerDirect", {
           email: s.email,
           password: s.password,
           firstName: s.firstName,
           lastName: s.lastName,
-        });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.registerFailed", "Account creation failed. Try another email.") });
-      }
+        }),
+        copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in."),
+        copyParam("storeAccount.registerFailed", "Account creation failed. Try another email."),
+      );
     },
     signOut: async (s) => {
+      routeInputConsumed = true;
       try { await dispatch("himi.wix.signOut"); } catch { /* ignore */ }
       // Do NOT re-probe via getMyData after logout — visitor-scoped my-data can
       // still return a site nickname and resurrect isMember (BUG-3). Trust the