From e1275dcc26d0e8c667fef876d413446a5b008d29 Mon Sep 17 00:00:00 2001 From: Arron Atchison Date: Tue, 27 Oct 2026 18:52:54 -0700 Subject: [PATCH 1/2] Point stage at auth.stage-thundermail.com and accounts.stage-thundermail.com Backend: OIDC_TOKEN_INTROSPECTION_URL, TB_ACCOUNTS_HOST in pulumi/config.stage.yaml. Frontend: VITE_TB_ACCOUNT_DASHBOARD_URL, VITE_SUPPORT_URL, VITE_OIDC_ROOT_URL in frontend/.env.stage.example. Part of https://github.com/thunderbird/platform-infrastructure/issues/1536 Refs https://github.com/thunderbird/platform-infrastructure/issues/1546 --- frontend/.env.stage.example | 6 +++--- pulumi/config.stage.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/.env.stage.example b/frontend/.env.stage.example index 9e46f327a..ed3f52f24 100644 --- a/frontend/.env.stage.example +++ b/frontend/.env.stage.example @@ -9,7 +9,7 @@ VITE_SENTRY_DSN=https://66f57328baac4929be7d62b77f41b510@o4505428107853824.inges # -- Auth scheme -- VITE_AUTH_SCHEME=oidc -VITE_TB_ACCOUNT_DASHBOARD_URL=https://accounts-stage.tb.pro/dashboard +VITE_TB_ACCOUNT_DASHBOARD_URL=https://accounts.stage-thundermail.com/dashboard # -- Posthog -- VITE_POSTHOG_PROJECT_KEY=phc_jPP49KIEgnkSKAjsDzCrQrJiGQVzCd0iAyVJetd2abv @@ -20,11 +20,11 @@ VITE_POSTHOG_UI_HOST=https://us.posthog.com VITE_DEFAULT_HOUR_FORMAT=12 VITE_TB_PRO_URL=https://stage.tb.pro -VITE_SUPPORT_URL=https://accounts-stage.tb.pro/contact +VITE_SUPPORT_URL=https://accounts.stage-thundermail.com/contact VITE_MAIL_URL=https://webmail.stage-thundermail.com VITE_SEND_URL=https://send-stage.tb.pro VITE_OIDC_CLIENT_ID=thunderbird-appointment-frontend -VITE_OIDC_ROOT_URL=https://auth-stage.tb.pro/realms/tbpro/ +VITE_OIDC_ROOT_URL=https://auth.stage-thundermail.com/realms/tbpro/ VITE_THUNDERMAIL_CALDAV_URL=mail.stage-thundermail.com diff --git a/pulumi/config.stage.yaml b/pulumi/config.stage.yaml index 2a37952e6..89a9b786b 100644 --- a/pulumi/config.stage.yaml +++ b/pulumi/config.stage.yaml @@ -21,7 +21,7 @@ .log_use_stream: &VAR_LOG_USE_STREAM {name: "LOG_USE_STREAM", value: "True"} .oidc_exp_grace_period: &VAR_OIDC_EXP_GRACE_PERIOD {name: "OIDC_EXP_GRACE_PERIOD", value: "60"} .oidc_fallback_match_by_email: &VAR_OIDC_FALLBACK_MATCH_BY_EMAIL {name: "OIDC_FALLBACK_MATCH_BY_EMAIL", value: "True"} -.oidc_token_introspection_url: &VAR_OIDC_TOKEN_INTROSPECTION_URL {name: "OIDC_TOKEN_INTROSPECTION_URL", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/token/introspect"} +.oidc_token_introspection_url: &VAR_OIDC_TOKEN_INTROSPECTION_URL {name: "OIDC_TOKEN_INTROSPECTION_URL", value: "https://auth.stage-thundermail.com/realms/tbpro/protocol/openid-connect/token/introspect"} .posthog_host: &VAR_POSTHOG_HOST {name: "POSTHOG_HOST", value: "https://us.i.posthog.com"} .redis_db: &VAR_REDIS_DB {name: "REDIS_DB", value: "0"} .redis_port: &VAR_REDIS_PORT {name: "REDIS_PORT", value: "6379"} @@ -34,7 +34,7 @@ .smtp_port: &VAR_SMTP_PORT {name: "SMTP_PORT", value: "587"} .smtp_security: &VAR_SMTP_SECURITY {name: "SMTP_SECURITY", value: "STARTTLS"} .tb_accounts_caldav_url: &VAR_TB_ACCOUNTS_CALDAV_URL {name: "TB_ACCOUNTS_CALDAV_URL", value: "https://stage-thundermail.com"} -.tb_accounts_host: &VAR_TB_ACCOUNTS_HOST {name: "TB_ACCOUNTS_HOST", value: "https://accounts-stage.tb.pro"} +.tb_accounts_host: &VAR_TB_ACCOUNTS_HOST {name: "TB_ACCOUNTS_HOST", value: "https://accounts.stage-thundermail.com"} .tier_basic_calendar_limit: &VAR_TIER_BASIC_CALENDAR_LIMIT {name: "TIER_BASIC_CALENDAR_LIMIT", value: "3"} .tier_plus_calendar_limit: &VAR_TIER_PLUS_CALENDAR_LIMIT {name: "TIER_PLUS_CALENDAR_LIMIT", value: "5"} .tier_pro_calendar_limit: &VAR_TIER_PRO_CALENDAR_LIMIT {name: "TIER_PRO_CALENDAR_LIMIT", value: "10"} From 93321ee069721b5f422452d34d79b2c8fd8a8c8e Mon Sep 17 00:00:00 2001 From: Arron Atchison Date: Tue, 27 Oct 2026 18:52:55 -0700 Subject: [PATCH 2/2] Revert "Point stage at auth.stage-thundermail.com and accounts.stage-thundermail.com" This reverts commit e1275dcc26d0e8c667fef876d413446a5b008d29. Part of https://github.com/thunderbird/platform-infrastructure/issues/1536 Refs https://github.com/thunderbird/platform-infrastructure/issues/1546 --- frontend/.env.stage.example | 6 +++--- pulumi/config.stage.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/.env.stage.example b/frontend/.env.stage.example index ed3f52f24..9e46f327a 100644 --- a/frontend/.env.stage.example +++ b/frontend/.env.stage.example @@ -9,7 +9,7 @@ VITE_SENTRY_DSN=https://66f57328baac4929be7d62b77f41b510@o4505428107853824.inges # -- Auth scheme -- VITE_AUTH_SCHEME=oidc -VITE_TB_ACCOUNT_DASHBOARD_URL=https://accounts.stage-thundermail.com/dashboard +VITE_TB_ACCOUNT_DASHBOARD_URL=https://accounts-stage.tb.pro/dashboard # -- Posthog -- VITE_POSTHOG_PROJECT_KEY=phc_jPP49KIEgnkSKAjsDzCrQrJiGQVzCd0iAyVJetd2abv @@ -20,11 +20,11 @@ VITE_POSTHOG_UI_HOST=https://us.posthog.com VITE_DEFAULT_HOUR_FORMAT=12 VITE_TB_PRO_URL=https://stage.tb.pro -VITE_SUPPORT_URL=https://accounts.stage-thundermail.com/contact +VITE_SUPPORT_URL=https://accounts-stage.tb.pro/contact VITE_MAIL_URL=https://webmail.stage-thundermail.com VITE_SEND_URL=https://send-stage.tb.pro VITE_OIDC_CLIENT_ID=thunderbird-appointment-frontend -VITE_OIDC_ROOT_URL=https://auth.stage-thundermail.com/realms/tbpro/ +VITE_OIDC_ROOT_URL=https://auth-stage.tb.pro/realms/tbpro/ VITE_THUNDERMAIL_CALDAV_URL=mail.stage-thundermail.com diff --git a/pulumi/config.stage.yaml b/pulumi/config.stage.yaml index 89a9b786b..2a37952e6 100644 --- a/pulumi/config.stage.yaml +++ b/pulumi/config.stage.yaml @@ -21,7 +21,7 @@ .log_use_stream: &VAR_LOG_USE_STREAM {name: "LOG_USE_STREAM", value: "True"} .oidc_exp_grace_period: &VAR_OIDC_EXP_GRACE_PERIOD {name: "OIDC_EXP_GRACE_PERIOD", value: "60"} .oidc_fallback_match_by_email: &VAR_OIDC_FALLBACK_MATCH_BY_EMAIL {name: "OIDC_FALLBACK_MATCH_BY_EMAIL", value: "True"} -.oidc_token_introspection_url: &VAR_OIDC_TOKEN_INTROSPECTION_URL {name: "OIDC_TOKEN_INTROSPECTION_URL", value: "https://auth.stage-thundermail.com/realms/tbpro/protocol/openid-connect/token/introspect"} +.oidc_token_introspection_url: &VAR_OIDC_TOKEN_INTROSPECTION_URL {name: "OIDC_TOKEN_INTROSPECTION_URL", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/token/introspect"} .posthog_host: &VAR_POSTHOG_HOST {name: "POSTHOG_HOST", value: "https://us.i.posthog.com"} .redis_db: &VAR_REDIS_DB {name: "REDIS_DB", value: "0"} .redis_port: &VAR_REDIS_PORT {name: "REDIS_PORT", value: "6379"} @@ -34,7 +34,7 @@ .smtp_port: &VAR_SMTP_PORT {name: "SMTP_PORT", value: "587"} .smtp_security: &VAR_SMTP_SECURITY {name: "SMTP_SECURITY", value: "STARTTLS"} .tb_accounts_caldav_url: &VAR_TB_ACCOUNTS_CALDAV_URL {name: "TB_ACCOUNTS_CALDAV_URL", value: "https://stage-thundermail.com"} -.tb_accounts_host: &VAR_TB_ACCOUNTS_HOST {name: "TB_ACCOUNTS_HOST", value: "https://accounts.stage-thundermail.com"} +.tb_accounts_host: &VAR_TB_ACCOUNTS_HOST {name: "TB_ACCOUNTS_HOST", value: "https://accounts-stage.tb.pro"} .tier_basic_calendar_limit: &VAR_TIER_BASIC_CALENDAR_LIMIT {name: "TIER_BASIC_CALENDAR_LIMIT", value: "3"} .tier_plus_calendar_limit: &VAR_TIER_PLUS_CALENDAR_LIMIT {name: "TIER_PLUS_CALENDAR_LIMIT", value: "5"} .tier_pro_calendar_limit: &VAR_TIER_PRO_CALENDAR_LIMIT {name: "TIER_PRO_CALENDAR_LIMIT", value: "10"}