From 80c7750f4a47a81a76a8a24ee8eb96c4cf5a41c1 Mon Sep 17 00:00:00 2001
From: EYHN <cneyhn@gmail.com>
Date: Mon, 1 Apr 2024 13:26:39 +0000
Subject: [PATCH] fix(core): selfhost redirect url (#6426)

---
 packages/frontend/core/src/utils/cloud-utils.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/core/src/utils/cloud-utils.tsx b/packages/frontend/core/src/utils/cloud-utils.tsx
index 32ffdbc081ab..2efae584709a 100644
--- a/packages/frontend/core/src/utils/cloud-utils.tsx
+++ b/packages/frontend/core/src/utils/cloud-utils.tsx
@@ -94,13 +94,13 @@ async function signIn(
     url.searchParams.set(key, searchParams[key]);
   }
 
-  const redirectUri =
-    runtimeConfig.serverUrlPrefix +
-    (environment.isDesktop
-      ? buildRedirectUri('/open-app/signin-redirect')
-      : location.pathname);
+  const redirectUri = new URL(location.href);
 
-  url.searchParams.set('redirect_uri', redirectUri);
+  if (environment.isDesktop) {
+    redirectUri.pathname = buildRedirectUri('/open-app/signin-redirect');
+  }
+
+  url.searchParams.set('redirect_uri', redirectUri.toString());
 
   return fetch(url.toString(), {
     method: 'POST',