From e3cb8f9e2d4c1c99454e5827d3bf04bcee51c440 Mon Sep 17 00:00:00 2001
From: Dilusha-Madushan <dilushamadushan9912@gmail.com>
Date: Thu, 28 May 2026 17:45:25 +0530
Subject: [PATCH] Fix afterSignUpUrl base path in SignUpBox to include BASE_URL
 prefix

---
 .../apps/gate/src/components/SignUp/SignUpBox.tsx     | 11 ++++++++---
 .../components/SignUp/__tests__/SignUpBox.test.tsx    | 11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/apps/gate/src/components/SignUp/SignUpBox.tsx b/frontend/apps/gate/src/components/SignUp/SignUpBox.tsx
index d33c9948a5..a5fca2cf0c 100644
--- a/frontend/apps/gate/src/components/SignUp/SignUpBox.tsx
+++ b/frontend/apps/gate/src/components/SignUp/SignUpBox.tsx
@@ -37,7 +37,12 @@ export default function SignUpBox(): JSX.Element {
   const {isDesignEnabled} = useDesign();
   const [flowError, setFlowError] = useState<string | null>(null);
 
-  const signInUrl = ROUTES.AUTH.SIGN_IN;
+  // For React Router navigate() — basename is handled by the router.
+  const signInPath = ROUTES.AUTH.SIGN_IN;
+  // For window.location.href and new URL() (via afterSignUpUrl) — React Router basename is
+  // bypassed, so an absolute URL with origin + base path must be constructed explicitly.
+  // Vite appends a trailing slash to BASE_URL.
+  const afterSignUpUrl = `${window.location.origin}${import.meta.env.BASE_URL.replace(/\/$/, '')}${signInPath}`;
 
   const renderFlowContent = (
     components: EmbeddedFlowComponent[],
@@ -103,7 +108,7 @@ export default function SignUpBox(): JSX.Element {
       logoDisplay={!isDesignEnabled ? {xs: 'flex', md: 'none'} : {display: 'none'}}
     >
       <SignUp
-        afterSignUpUrl={signInUrl}
+        afterSignUpUrl={afterSignUpUrl}
         onFlowChange={(response: any) => {
           if (response?.failureReason) {
             setFlowError(response.failureReason as string);
@@ -151,7 +156,7 @@ export default function SignUpBox(): JSX.Element {
                 <Button
                   variant="text"
                   onClick={() => {
-                    void navigate(signInUrl);
+                    void navigate(signInPath);
                   }}
                   sx={{
                     p: 0,
diff --git a/frontend/apps/gate/src/components/SignUp/__tests__/SignUpBox.test.tsx b/frontend/apps/gate/src/components/SignUp/__tests__/SignUpBox.test.tsx
index d06fc4294d..3d1dfc8d10 100644
--- a/frontend/apps/gate/src/components/SignUp/__tests__/SignUpBox.test.tsx
+++ b/frontend/apps/gate/src/components/SignUp/__tests__/SignUpBox.test.tsx
@@ -98,6 +98,7 @@ const createMockSignUpRenderProps = (overrides: Partial<MockSignUpRenderProps> =
 
 let mockSignUpRenderProps: MockSignUpRenderProps = createMockSignUpRenderProps();
 let capturedOnFlowChange: ((response: unknown) => void) | undefined;
+let capturedAfterSignUpUrl: string | undefined;
 
 vi.mock('@thunderid/react', async () => {
   const actual = await vi.importActual('@thunderid/react');
@@ -106,11 +107,14 @@ vi.mock('@thunderid/react', async () => {
     SignUp: ({
       children,
       onFlowChange = undefined,
+      afterSignUpUrl = undefined,
     }: {
       children: (props: typeof mockSignUpRenderProps) => React.ReactNode;
       onFlowChange?: (response: unknown) => void;
+      afterSignUpUrl?: string;
     }) => {
       capturedOnFlowChange = onFlowChange;
+      capturedAfterSignUpUrl = afterSignUpUrl;
       return <div data-testid="thunderid-signup">{children(mockSignUpRenderProps)}</div>;
     },
     EmbeddedFlowComponentType: {
@@ -135,6 +139,7 @@ describe('SignUpBox', () => {
     });
     mockSignUpRenderProps = createMockSignUpRenderProps();
     capturedOnFlowChange = undefined;
+    capturedAfterSignUpUrl = undefined;
   });
 
   it('renders without crashing', () => {
@@ -545,6 +550,12 @@ describe('SignUpBox', () => {
     expect(screen.getByText('Sign in')).toBeInTheDocument();
   });
 
+  it('passes afterSignUpUrl as an absolute URL with origin and BASE_URL prefix to SignUp component', () => {
+    render(<SignUpBox />);
+    const expectedUrl = `${window.location.origin}${import.meta.env.BASE_URL.replace(/\/$/, '')}/signin`;
+    expect(capturedAfterSignUpUrl).toBe(expectedUrl);
+  });
+
   it('navigates to sign in page when clicking sign in link', async () => {
     mockSignUpRenderProps = createMockSignUpRenderProps({
       components: [{id: 'block', type: 'BLOCK', components: []}],