From 7484afa18ee024b74d5a52cc46af91dc826ca048 Mon Sep 17 00:00:00 2001
From: aecsocket <aecsocket@tutanota.com>
Date: Tue, 14 Apr 2026 19:16:14 +0100
Subject: [PATCH] Revert "Use user-provided callback addr instead of SELF_ADDR"

This reverts commit 7ea0635d865447ac9ada376c7c0073272efc201f.
---
 apps/labrinth/src/routes/internal/flows.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index 5679288368..f7e41d60ac 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -237,11 +237,11 @@ impl TempUser {
 impl AuthProvider {
     pub fn get_redirect_url(
         &self,
-        raw_redirect_url: Url,
         state: String,
     ) -> Result<String, AuthenticationError> {
         let self_addr = &ENV.SELF_ADDR;
-        let redirect_uri = urlencoding::encode(raw_redirect_url.as_str());
+        let raw_redirect_uri = format!("{self_addr}/v2/auth/callback");
+        let redirect_uri = urlencoding::encode(&raw_redirect_uri);
 
         Ok(match self {
             AuthProvider::GitHub => {
@@ -1107,17 +1107,17 @@ pub async fn init(
 
     let state = DBFlow::OAuth {
         user_id,
-        url: url.clone(),
+        url,
         provider: info.provider,
         existing_user_id,
     }
     .insert(Duration::minutes(30), &redis)
     .await?;
 
-    let provider_redirect_url = info.provider.get_redirect_url(url, state)?;
+    let url = info.provider.get_redirect_url(state)?;
     Ok(HttpResponse::TemporaryRedirect()
-        .append_header(("Location", &*provider_redirect_url))
-        .json(serde_json::json!({ "url": provider_redirect_url })))
+        .append_header(("Location", &*url))
+        .json(serde_json::json!({ "url": url })))
 }
 
 #[get("/callback")]