From 27f471aa48096714e5f65b020fe1c83e2a8da74f Mon Sep 17 00:00:00 2001 From: "joel@joellee.org" Date: Fri, 22 Jul 2022 16:33:38 +0800 Subject: [PATCH 1/2] chore: update available env vars --- docker/.env.example | 7 +++++++ docker/docker-compose.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/docker/.env.example b/docker/.env.example index 3412b1edaac..169d70fc5f0 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -43,6 +43,13 @@ SITE_URL=http://localhost:3000 ADDITIONAL_REDIRECT_URLS= JWT_EXPIRY=3600 DISABLE_SIGNUP=false +API_EXTERNAL_URL=http://localhost:8000 + +## Mailer Config +GOTRUE_MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify" +GOTRUE_MAILER_URLPATHS_INVITE="/auth/v1/verify" +GOTRUE_MAILER_URLPATHS_RECOVERY="/auth/v1/verify" +GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify" ## Email auth ENABLE_EMAIL_SIGNUP=true diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3db87b2967c..e8fd5b54de8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -47,6 +47,7 @@ services: environment: GOTRUE_API_HOST: 0.0.0.0 GOTRUE_API_PORT: 9999 + API_EXTERNAL_URL: ${API_EXTERNAL_URL} GOTRUE_DB_DRIVER: postgres GOTRUE_DB_DATABASE_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?search_path=auth From a86db77ee483a5bf790f32038ac7ae50764c4442 Mon Sep 17 00:00:00 2001 From: "joel@joellee.org" Date: Fri, 22 Jul 2022 16:39:50 +0800 Subject: [PATCH 2/2] chore: update naming --- docker/.env.example | 8 ++++---- docker/docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/.env.example b/docker/.env.example index 169d70fc5f0..b6aa9a0fd95 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -46,10 +46,10 @@ DISABLE_SIGNUP=false API_EXTERNAL_URL=http://localhost:8000 ## Mailer Config -GOTRUE_MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify" -GOTRUE_MAILER_URLPATHS_INVITE="/auth/v1/verify" -GOTRUE_MAILER_URLPATHS_RECOVERY="/auth/v1/verify" -GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify" +MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify" +MAILER_URLPATHS_INVITE="/auth/v1/verify" +MAILER_URLPATHS_RECOVERY="/auth/v1/verify" +MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify" ## Email auth ENABLE_EMAIL_SIGNUP=true diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e8fd5b54de8..c9c17cf7fc3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -70,10 +70,10 @@ services: GOTRUE_SMTP_USER: ${SMTP_USER} GOTRUE_SMTP_PASS: ${SMTP_PASS} GOTRUE_SMTP_SENDER_NAME: ${SMTP_SENDER_NAME} - GOTRUE_MAILER_URLPATHS_INVITE: /auth/v1/verify - GOTRUE_MAILER_URLPATHS_CONFIRMATION: /auth/v1/verify - GOTRUE_MAILER_URLPATHS_RECOVERY: /auth/v1/verify - GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: /auth/v1/verify + GOTRUE_MAILER_URLPATHS_INVITE: ${MAILER_URLPATHS_INVITE} + GOTRUE_MAILER_URLPATHS_CONFIRMATION: ${MAILER_URLPATHS_CONFIRMATION} + GOTRUE_MAILER_URLPATHS_RECOVERY: ${MAILER_URLPATHS_RECOVERY} + GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: ${MAILER_URLPATHS_EMAIL_CHANGE} GOTRUE_EXTERNAL_PHONE_ENABLED: ${ENABLE_PHONE_SIGNUP} GOTRUE_SMS_AUTOCONFIRM: ${ENABLE_PHONE_AUTOCONFIRM}