diff --git a/.env b/.env index 631df029..cf8dbcf8 100644 --- a/.env +++ b/.env @@ -19,6 +19,7 @@ MEILISEARCH_ADDR=http://localhost:7700 MEILISEARCH_KEY=modrinth BIND_ADDR=127.0.0.1:8000 +SELF_ADDR=http://127.0.0.1:8000 MOCK_FILE_PATH=/tmp/modrinth MINOS_URL=http://127.0.0.1:4000 diff --git a/src/main.rs b/src/main.rs index 42f6930e..82a4c9ec 100644 --- a/src/main.rs +++ b/src/main.rs @@ -396,6 +396,7 @@ fn check_env_vars() -> bool { failed |= check_var::("MEILISEARCH_ADDR"); failed |= check_var::("MEILISEARCH_KEY"); failed |= check_var::("BIND_ADDR"); + failed |= check_var::("SELF_ADDR"); failed |= check_var::("STORAGE_BACKEND"); diff --git a/src/routes/v2/auth.rs b/src/routes/v2/auth.rs index 7589ae0f..2833b0e5 100644 --- a/src/routes/v2/auth.rs +++ b/src/routes/v2/auth.rs @@ -133,10 +133,10 @@ pub async fn init( transaction.commit().await?; let kratos_url = dotenvy::var("KRATOS_URL")?; - let labrinth_url = dotenvy::var("BIND_ADDR")?; + let labrinth_url = dotenvy::var("SELF_ADDR")?; let url = format!( // Callback URL of initialization is /callback below. - "{kratos_url}/self-service/login/browser?return_to=http://{labrinth_url}/v2/auth/callback?state={}", + "{kratos_url}/self-service/login/browser?return_to={labrinth_url}/v2/auth/callback?state={}", to_base62(state.0 as u64) ); Ok(HttpResponse::TemporaryRedirect()