sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-09-05 06:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: backend response for create oauth account

Browse Source
This commit is contained in:
tdgao
2026-04-17 09:45:32 -06:00
parent 66f3c39c13
commit 57b4f21080
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/labrinth/src/routes/internal/flows.rs
+9 -14
View File
@@ -23,7 +23,7 @@ use crate::util::ext::get_image_ext;
use crate::util::img::upload_image_optimized; use crate::util::img::upload_image_optimized;
use crate::util::validate::validation_errors_to_string; use crate::util::validate::validation_errors_to_string;
use actix_http::header::LOCATION; use actix_http::header::LOCATION;
use actix_web::web::{Data, Query, Redirect, ServiceConfig, scope}; use actix_web::web::{Data, Query, ServiceConfig, scope};
use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web}; use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
use argon2::password_hash::SaltString; use argon2::password_hash::SaltString;
use argon2::{Argon2, PasswordHash, PasswordHasher, PasswordVerifier}; use argon2::{Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
@@ -1336,9 +1336,9 @@ pub async fn auth_callback(
} else { } else {
// user doesn't already exist; the user wants to create a new Modrinth account // user doesn't already exist; the user wants to create a new Modrinth account
// linked to their OAuth account. // linked to their OAuth account.
// for this, we redirect them to a frontend page which lets them set a username, // for this, we redirect them to a frontend page which lets them set a username.
// then frontend will redirect them back to us (`/create/oauth`), with the same // then frontend will call `/create/oauth` with the same state parameter and
// state parameter, and their chosen settings (username, subscribe to newsletter). // chosen settings (username, subscribe to newsletter), and handle navigation.
flow_guard flow_guard
.replace_with(DBFlow::OAuthPending { .replace_with(DBFlow::OAuthPending {
@@ -1358,7 +1358,7 @@ pub async fn auth_callback(
&requires_dob(provider).to_string(), &requires_dob(provider).to_string(),
); );
let redirect_url = url.to_string(); let redirect_url = redirect_url.to_string();
Ok(HttpResponse::TemporaryRedirect() Ok(HttpResponse::TemporaryRedirect()
.append_header((LOCATION, &*redirect_url)) .append_header((LOCATION, &*redirect_url))
.json(serde_json::json!({ "url": redirect_url }))) .json(serde_json::json!({ "url": redirect_url })))
@@ -1393,7 +1393,7 @@ async fn create_oauth_account(
file_host: Data<Arc<dyn FileHost + Send + Sync>>, file_host: Data<Arc<dyn FileHost + Send + Sync>>,
redis: Data<RedisPool>, redis: Data<RedisPool>,
web::Json(new_account): web::Json<NewOAuthAccount>, web::Json(new_account): web::Json<NewOAuthAccount>,
) -> Result<Redirect, ApiError> { ) -> Result<HttpResponse, ApiError> {
if !check_hcaptcha(&req, &new_account.challenge).await? { if !check_hcaptcha(&req, &new_account.challenge).await? {
return Err(ApiError::Turnstile); return Err(ApiError::Turnstile);
} }
@@ -1404,7 +1404,7 @@ async fn create_oauth_account(
.wrap_request_err("no flow for state")?; .wrap_request_err("no flow for state")?;
let DBFlow::OAuthPending { let DBFlow::OAuthPending {
url, url: _url,
provider, provider,
user, user,
} = flow } = flow
@@ -1430,15 +1430,10 @@ async fn create_oauth_account(
.await?; .await?;
let session = issue_session(req, user_id, &mut txn, &redis, None).await?; let session = issue_session(req, user_id, &mut txn, &redis, None).await?;
let res = crate::models::sessions::Session::from(session, true, None);
txn.commit().await?; txn.commit().await?;
let mut redirect_url = url.clone(); Ok(HttpResponse::Ok().json(res))
redirect_url
.query_pairs_mut()
.append_pair("code", &session.session);
let redirect_url = redirect_url.to_string();
Ok(Redirect::to(redirect_url))
} }
#[derive(Deserialize)] #[derive(Deserialize)]