Fix URL generated (#7478)

src/routes/utils.ts

@@ -1,6 +1,9 @@
 import { NODE_ENV, VITE_KC_SITE_BASE_URL } from '@src/env'
 import { isDesktop } from '@src/lib/isDesktop'
-import { IS_PLAYWRIGHT_KEY } from '@src/lib/constants'
+import {
+  IS_PLAYWRIGHT_KEY,
+  IMMEDIATE_SIGN_IN_IF_NECESSARY_QUERY_PARAM,
+} from '@src/lib/constants'
 import { PATHS } from '@src/lib/paths'
 
 const isTestEnv = window?.localStorage.getItem(IS_PLAYWRIGHT_KEY) === 'true'
@@ -30,9 +33,15 @@ export function getReleaseUrl(version: string = APP_VERSION) {
 }
 
 export function generateSignInUrl() {
+  const queryParamsNext = window.location.search.replace(
+    IMMEDIATE_SIGN_IN_IF_NECESSARY_QUERY_PARAM,
+    ''
+  )
+  const finalURL =
+    typeof window !== 'undefined' &&
+    (window.location.origin + queryParamsNext).replace('?&', '?')
+
   return `${VITE_KC_SITE_BASE_URL}${
     PATHS.SIGN_IN
-  }?callbackUrl=${encodeURIComponent(
-    typeof window !== 'undefined' && window.location.href.replace('signin', '')
-  )}`
+  }?callbackUrl=${encodeURIComponent(finalURL)}`
 }