@pradip1995/segment-login-template 0.5.5 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pradip1995/segment-login-template",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -35,7 +35,7 @@
   "dependencies": {
     "@pradip1995/commerce-auth": "^4.0.0",
     "@pradip1995/commerce-core": "^4.0.0",
-    "@pradip1995/segment-primitives": "^0.4.0",
+    "@pradip1995/segment-primitives": "^0.4.3",
     "@pradip1995/segment-tokens": "^0.3.7"
   },
   "devDependencies": {

package/src/account-profile.tsx

@@ -10,6 +10,7 @@ import {
 import type { OtpVerificationComponent } from "./otp-component"
 import OtpVerificationModal from "./otp-verification-modal"
 import { acct } from "./account-theme"
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 
 export default function AccountProfile({
   customer,
@@ -41,9 +42,10 @@ export default function AccountProfile({
       })
       return { ok: true as const, error: null as string | null }
     } catch (err) {
+      if (isNextRedirect(err)) throw err
       return {
         ok: false as const,
-        error: err instanceof Error ? err.message : "Failed to update profile",
+        error: safeErrorMessage(err, "Failed to update profile"),
       }
     }
   }
@@ -61,7 +63,8 @@ export default function AccountProfile({
       setOtp("")
       setOtpOpen(true)
     } catch (err) {
-      setOtpError(err instanceof Error ? err.message : "Failed to send code")
+      if (isNextRedirect(err)) throw err
+      setOtpError(safeErrorMessage(err, "Failed to send code"))
     } finally {
       setOtpPending(false)
     }
@@ -76,14 +79,15 @@ export default function AccountProfile({
         otpToken: otpToken || "",
         code: otp,
         countryCode,
+        skipRedirect: true,
       })
       if (!res.success) throw new Error(res.error || "Invalid code")
       setOtpOpen(false)
       setMessage("Verification successful.")
       window.location.reload()
     } catch (err) {
-      setOtpError(err instanceof Error ? err.message : "Verification failed")
-    } finally {
+      if (isNextRedirect(err)) throw err
+      setOtpError(safeErrorMessage(err, "Verification failed"))
       setOtpPending(false)
     }
   }

package/src/auth-server.ts

@@ -203,6 +203,8 @@ export async function verifyRegistrationOtp(input: {
   otpToken: string
   code: string
   countryCode: string
+  /** When true, do not redirect after login (account profile verify flow). */
+  skipRedirect?: boolean
 }) {
   const response = await fetch(`${getBaseUrl()}/store/customers/otp/verify`, {
     method: "POST",
@@ -239,7 +241,9 @@ export async function verifyRegistrationOtp(input: {
     }
     const customerCacheTag = await getCacheTag("customers")
     revalidateTag(customerCacheTag)
-    redirect(`/${input.countryCode || "in"}`)
+    if (!input.skipRedirect) {
+      redirect(`/${input.countryCode || "in"}`)
+    }
   }
 
   return {

package/src/forgot-password-form.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useState } from "react"
 import { checkEmailRegistered, requestPasswordReset } from "./auth-server"
 import { auth } from "./account-theme"
@@ -36,7 +37,8 @@ export default function ForgotPasswordForm({ onBack }: { onBack: () => void }) {
       setSuccess(true)
       setMessage(result.message || "If an account exists, you will receive a reset link shortly.")
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Something went wrong")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Something went wrong"))
     } finally {
       setPending(false)
     }

package/src/guest-order-modal.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useEffect, useRef, useState } from "react"
 import { sendOTP, verifyOTP } from "./auth-server"
 import OtpVerificationModal from "./otp-verification-modal"
@@ -61,7 +62,8 @@ export default function GuestOrderModal({
       setOtp("")
       setStep("otp")
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to send code")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Failed to send code"))
       setStep("email")
     } finally {
       setPending(false)
@@ -84,7 +86,8 @@ export default function GuestOrderModal({
         window.location.href = `/${countryCode}/account/guest-orders`
       }, 900)
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Verification failed")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Verification failed"))
       setPending(false)
     }
   }

package/src/is-next-redirect.ts

@@ -0,0 +1,60 @@
+/**
+ * Shared Next.js redirect/notFound detection for segment-login-template.
+ * Keep in sync with @pradip1995/segment-primitives/is-next-redirect.
+ */
+
+const CONTROL_FLOW_RE = /NEXT_REDIRECT|NEXT_REDIRECTION|NEXT_NOT_FOUND|NEXT_HTTP_ERROR_FALLBACK/i
+
+function textLooksLikeControlFlow(value: string): boolean {
+  return CONTROL_FLOW_RE.test(value)
+}
+
+export function isNextRedirect(err: unknown): boolean {
+  if (err == null) return false
+
+  if (typeof err === "string") {
+    return textLooksLikeControlFlow(err)
+  }
+
+  if (typeof err !== "object") {
+    return textLooksLikeControlFlow(String(err))
+  }
+
+  const digest =
+    "digest" in err ? String((err as { digest?: unknown }).digest ?? "") : ""
+  if (textLooksLikeControlFlow(digest)) {
+    return true
+  }
+
+  const message =
+    err instanceof Error
+      ? err.message
+      : "message" in err
+        ? String((err as { message?: unknown }).message ?? "")
+        : ""
+
+  if (textLooksLikeControlFlow(message)) {
+    return true
+  }
+
+  try {
+    return textLooksLikeControlFlow(String(err))
+  } catch {
+    return false
+  }
+}
+
+export function safeErrorMessage(err: unknown, fallback: string): string {
+  if (isNextRedirect(err)) return fallback
+  if (err instanceof Error) {
+    const msg = err.message?.trim()
+    if (!msg || textLooksLikeControlFlow(msg)) return fallback
+    return msg
+  }
+  if (typeof err === "string") {
+    const msg = err.trim()
+    if (!msg || textLooksLikeControlFlow(msg)) return fallback
+    return msg
+  }
+  return fallback
+}

package/src/login-form.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useActionState, useState } from "react"
 import { login } from "@pradip1995/commerce-core/client/actions/customer"
 import { sendAuthOtp, verifyAuthOtpAndLogin } from "./auth-server"
@@ -216,7 +217,8 @@ function OtpLoginForm({
       setOtp("")
       setShowOtpModal(true)
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to send code")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Failed to send code"))
     } finally {
       setPending(false)
     }
@@ -240,7 +242,7 @@ function OtpLoginForm({
       setOtpToken(res.token ?? null)
       setOtp("")
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to resend code")
+      setError(safeErrorMessage(err, "Failed to resend code"))
     } finally {
       setPending(false)
     }
@@ -269,7 +271,7 @@ function OtpLoginForm({
       }
     } catch (err) {
       if (isNextRedirect(err)) throw err
-      setError(err instanceof Error ? err.message : "Verification failed")
+      setError(safeErrorMessage(err, "Verification failed"))
       setPending(false)
     }
   }
@@ -437,21 +439,6 @@ function Chip({
   )
 }
 
-function isNextRedirect(err: unknown) {
-  if (!err || typeof err !== "object") return false
-  const digest =
-    "digest" in err ? String((err as { digest?: unknown }).digest ?? "") : ""
-  if (digest.includes("NEXT_REDIRECT") || digest.includes("NEXT_NOT_FOUND")) {
-    return true
-  }
-  const message =
-    err instanceof Error
-      ? err.message
-      : "message" in err
-        ? String((err as { message?: unknown }).message ?? "")
-        : ""
-  return message === "NEXT_REDIRECT" || message.includes("NEXT_REDIRECT")
-}
 
 function GuestPackageIcon() {
   return (

package/src/otp-unified-form.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useEffect, useState } from "react"
 import { SplitPhoneInput } from "@pradip1995/commerce-core/components/split-phone-input"
 import {
@@ -80,8 +81,8 @@ export default function OtpUnifiedForm({
       setOtp("")
       setResendIn(RESEND_COOLDOWN_SEC)
     } catch (err) {
-      const message = err instanceof Error ? err.message : "Failed to send code"
-      setError(message)
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Failed to send code"))
       if (!options?.resend) {
         setStep("identifier")
       }
@@ -112,7 +113,7 @@ export default function OtpUnifiedForm({
       }
     } catch (err) {
       if (isNextRedirect(err)) throw err
-      setError(err instanceof Error ? err.message : "Verification failed")
+      setError(safeErrorMessage(err, "Verification failed"))
       setVerifying(false)
     }
   }
@@ -330,18 +331,3 @@ function ModeButton({
   )
 }
 
-function isNextRedirect(err: unknown) {
-  if (!err || typeof err !== "object") return false
-  const digest =
-    "digest" in err ? String((err as { digest?: unknown }).digest ?? "") : ""
-  if (digest.includes("NEXT_REDIRECT") || digest.includes("NEXT_NOT_FOUND")) {
-    return true
-  }
-  const message =
-    err instanceof Error
-      ? err.message
-      : "message" in err
-        ? String((err as { message?: unknown }).message ?? "")
-        : ""
-  return message === "NEXT_REDIRECT" || message.includes("NEXT_REDIRECT")
-}

package/src/register-form.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useState } from "react"
 import {
   registerCustomer,
@@ -87,7 +88,8 @@ export default function RegisterForm({
       setStep("otp")
       setShowOtpModal(true)
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Registration failed")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Registration failed"))
     } finally {
       setPending(false)
     }
@@ -117,7 +119,7 @@ export default function RegisterForm({
       }, 2000)
     } catch (err) {
       if (isNextRedirect(err)) throw err
-      setError(err instanceof Error ? err.message : "Verification failed")
+      setError(safeErrorMessage(err, "Verification failed"))
     } finally {
       setPending(false)
     }
@@ -136,7 +138,8 @@ export default function RegisterForm({
       setOtpToken(result.token ?? null)
       setOtp("")
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to resend code")
+      if (isNextRedirect(err)) throw err
+      setError(safeErrorMessage(err, "Failed to resend code"))
     } finally {
       setPending(false)
     }
@@ -296,21 +299,6 @@ export default function RegisterForm({
   )
 }
 
-function isNextRedirect(err: unknown) {
-  if (!err || typeof err !== "object") return false
-  const digest =
-    "digest" in err ? String((err as { digest?: unknown }).digest ?? "") : ""
-  if (digest.includes("NEXT_REDIRECT") || digest.includes("NEXT_NOT_FOUND")) {
-    return true
-  }
-  const message =
-    err instanceof Error
-      ? err.message
-      : "message" in err
-        ? String((err as { message?: unknown }).message ?? "")
-        : ""
-  return message === "NEXT_REDIRECT" || message.includes("NEXT_REDIRECT")
-}
 
 function VerificationToggle({
   active,

package/src/reset-password-form.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { isNextRedirect, safeErrorMessage } from "./is-next-redirect"
 import { useState } from "react"
 import { useSearchParams } from "next/navigation"
 import { completePasswordResetAction } from "./auth-server"
@@ -49,7 +50,7 @@ export default function ResetPasswordForm({ countryCode }: { countryCode: string
       }
     } catch (err) {
       if (isNextRedirect(err)) throw err
-      setError(err instanceof Error ? err.message : "Failed to reset password")
+      setError(safeErrorMessage(err, "Failed to reset password"))
       setPending(false)
     }
   }
@@ -100,18 +101,3 @@ export default function ResetPasswordForm({ countryCode }: { countryCode: string
   )
 }
 
-function isNextRedirect(err: unknown) {
-  if (!err || typeof err !== "object") return false
-  const digest =
-    "digest" in err ? String((err as { digest?: unknown }).digest ?? "") : ""
-  if (digest.includes("NEXT_REDIRECT") || digest.includes("NEXT_NOT_FOUND")) {
-    return true
-  }
-  const message =
-    err instanceof Error
-      ? err.message
-      : "message" in err
-        ? String((err as { message?: unknown }).message ?? "")
-        : ""
-  return message === "NEXT_REDIRECT" || message.includes("NEXT_REDIRECT")
-}