From e778a24f41cf8c160f6ede1cd3fc70bb850309eb Mon Sep 17 00:00:00 2001 From: Jeroen Vijgen Date: Sun, 12 Apr 2026 23:35:40 +0000 Subject: [PATCH] HOTFIX: Add Email-Based Account Matching for Tandoor --- .../tandoor-service/.env.example | 1 + .../tandoor-service/main.tf | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/modules/30-services-software/tandoor-service/.env.example b/modules/30-services-software/tandoor-service/.env.example index 7bfc6cf..af48631 100644 --- a/modules/30-services-software/tandoor-service/.env.example +++ b/modules/30-services-software/tandoor-service/.env.example @@ -11,6 +11,7 @@ SOCIALACCOUNT_ONLY=1 # Fully disable local auth, we have no need for local auth. SOCIALACCOUNT_LOGIN_ON_GET=1 SOCIALACCOUNT_AUTO_SIGNUP=1 SOCIALACCOUNT_EMAIL_AUTHENTICATION=1 +SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT=1 MEDIA_URL="/media/" diff --git a/modules/30-services-software/tandoor-service/main.tf b/modules/30-services-software/tandoor-service/main.tf index 3c0f038..56bc9db 100644 --- a/modules/30-services-software/tandoor-service/main.tf +++ b/modules/30-services-software/tandoor-service/main.tf @@ -37,24 +37,25 @@ locals { ] tandoor_env_vars = { - ALLAUTH_TRUSTED_PROXY_COUNT = provider::dotenv::get_by_key("ALLAUTH_TRUSTED_PROXY_COUNT", local.env_file) - SOCIAL_PROVIDERS = provider::dotenv::get_by_key("SOCIAL_PROVIDERS", local.env_file) - SOCIALACCOUNT_PROVIDERS = provider::dotenv::get_by_key("SOCIALACCOUNT_PROVIDERS", local.env_file) - SOCIALACCOUNT_ONLY = provider::dotenv::get_by_key("SOCIALACCOUNT_ONLY", local.env_file) - SOCIALACCOUNT_LOGIN_ON_GET = provider::dotenv::get_by_key("SOCIALACCOUNT_LOGIN_ON_GET", local.env_file) - SOCIALACCOUNT_AUTO_SIGNUP = provider::dotenv::get_by_key("SOCIALACCOUNT_AUTO_SIGNUP", local.env_file) - SOCIALACCOUNT_EMAIL_AUTHENTICATION = provider::dotenv::get_by_key("SOCIALACCOUNT_EMAIL_AUTHENTICATION", local.env_file) - ENABLE_SIGNUP = provider::dotenv::get_by_key("ENABLE_SIGNUP", local.env_file) - MEDIA_URL = provider::dotenv::get_by_key("MEDIA_URL", local.env_file) - SECRET_KEY = provider::dotenv::get_by_key("SECRET_KEY", local.env_file) - DEBUG = provider::dotenv::get_by_key("DEBUG", local.env_file) - ALLOWED_HOSTS = provider::dotenv::get_by_key("ALLOWED_HOSTS", local.env_file) - DB_ENGINE = provider::dotenv::get_by_key("DB_ENGINE", local.env_file) - POSTGRES_HOST = provider::dotenv::get_by_key("POSTGRES_HOST", local.env_file) - POSTGRES_DB = provider::dotenv::get_by_key("POSTGRES_DB", local.env_file) - POSTGRES_PORT = provider::dotenv::get_by_key("POSTGRES_PORT", local.env_file) - POSTGRES_USER = provider::dotenv::get_by_key("POSTGRES_USER", local.env_file) - POSTGRES_PASSWORD = provider::dotenv::get_by_key("POSTGRES_PASSWORD", local.env_file) + ALLAUTH_TRUSTED_PROXY_COUNT = provider::dotenv::get_by_key("ALLAUTH_TRUSTED_PROXY_COUNT", local.env_file) + SOCIAL_PROVIDERS = provider::dotenv::get_by_key("SOCIAL_PROVIDERS", local.env_file) + SOCIALACCOUNT_PROVIDERS = provider::dotenv::get_by_key("SOCIALACCOUNT_PROVIDERS", local.env_file) + SOCIALACCOUNT_ONLY = provider::dotenv::get_by_key("SOCIALACCOUNT_ONLY", local.env_file) + SOCIALACCOUNT_LOGIN_ON_GET = provider::dotenv::get_by_key("SOCIALACCOUNT_LOGIN_ON_GET", local.env_file) + SOCIALACCOUNT_AUTO_SIGNUP = provider::dotenv::get_by_key("SOCIALACCOUNT_AUTO_SIGNUP", local.env_file) + SOCIALACCOUNT_EMAIL_AUTHENTICATION = provider::dotenv::get_by_key("SOCIALACCOUNT_EMAIL_AUTHENTICATION", local.env_file) + SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = provider::dotenv::get_by_key("SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT", local.env_file) + ENABLE_SIGNUP = provider::dotenv::get_by_key("ENABLE_SIGNUP", local.env_file) + MEDIA_URL = provider::dotenv::get_by_key("MEDIA_URL", local.env_file) + SECRET_KEY = provider::dotenv::get_by_key("SECRET_KEY", local.env_file) + DEBUG = provider::dotenv::get_by_key("DEBUG", local.env_file) + ALLOWED_HOSTS = provider::dotenv::get_by_key("ALLOWED_HOSTS", local.env_file) + DB_ENGINE = provider::dotenv::get_by_key("DB_ENGINE", local.env_file) + POSTGRES_HOST = provider::dotenv::get_by_key("POSTGRES_HOST", local.env_file) + POSTGRES_DB = provider::dotenv::get_by_key("POSTGRES_DB", local.env_file) + POSTGRES_PORT = provider::dotenv::get_by_key("POSTGRES_PORT", local.env_file) + POSTGRES_USER = provider::dotenv::get_by_key("POSTGRES_USER", local.env_file) + POSTGRES_PASSWORD = provider::dotenv::get_by_key("POSTGRES_PASSWORD", local.env_file) } postgres_env_vars = {