sends own addr to auth callback (#639)

* sends own addr to auth callback

* shouldn't have http on local

* actually, both should have

* changed for consistency
This commit is contained in:
Wyatt Verchere
2023-06-15 16:12:02 -07:00
committed by GitHub
parent dd3599f5b3
commit d64c043838
3 changed files with 4 additions and 2 deletions

1
.env
View File

@@ -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

View File

@@ -396,6 +396,7 @@ fn check_env_vars() -> bool {
failed |= check_var::<String>("MEILISEARCH_ADDR");
failed |= check_var::<String>("MEILISEARCH_KEY");
failed |= check_var::<String>("BIND_ADDR");
failed |= check_var::<String>("SELF_ADDR");
failed |= check_var::<String>("STORAGE_BACKEND");

View File

@@ -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()