sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-08-30 19:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use user-provided callback addr instead of SELF_ADDR"

Browse Source 
This reverts commit 7ea0635d86.
This commit is contained in:
aecsocket
2026-04-14 19:16:14 +01:00
parent 7ea0635d86
commit 7484afa18e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/labrinth/src/routes/internal/flows.rs
+6 -6
View File
@@ -237,11 +237,11 @@ impl TempUser {
impl AuthProvider { impl AuthProvider {
pub fn get_redirect_url( pub fn get_redirect_url(
&self, &self,
raw_redirect_url: Url,
state: String, state: String,
) -> Result<String, AuthenticationError> { ) -> Result<String, AuthenticationError> {
let self_addr = &ENV.SELF_ADDR; 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 { Ok(match self {
AuthProvider::GitHub => { AuthProvider::GitHub => {
@@ -1107,17 +1107,17 @@ pub async fn init(
let state = DBFlow::OAuth { let state = DBFlow::OAuth {
user_id, user_id,
url: url.clone(), url,
provider: info.provider, provider: info.provider,
existing_user_id, existing_user_id,
} }
.insert(Duration::minutes(30), &redis) .insert(Duration::minutes(30), &redis)
.await?; .await?;
let provider_redirect_url = info.provider.get_redirect_url(url, state)?; let url = info.provider.get_redirect_url(state)?;
Ok(HttpResponse::TemporaryRedirect() Ok(HttpResponse::TemporaryRedirect()
.append_header(("Location", &*provider_redirect_url)) .append_header(("Location", &*url))
.json(serde_json::json!({ "url": provider_redirect_url }))) .json(serde_json::json!({ "url": url })))
} }
#[get("/callback")] #[get("/callback")]