From 4097ca75d9d2738c2d3fe49b50d2496a55d53371 Mon Sep 17 00:00:00 2001 From: Vjeran Grozdanic Date: Wed, 12 Nov 2025 15:24:58 +0100 Subject: [PATCH] chore(auth): Clean up killswitch for treating demo user as anon --- src/sentry/auth/helper.py | 8 ++------ src/sentry/options/defaults.py | 8 -------- tests/sentry/web/frontend/test_auth_organization_login.py | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/sentry/auth/helper.py b/src/sentry/auth/helper.py index 55be7b52cfc596..60913af29170ca 100644 --- a/src/sentry/auth/helper.py +++ b/src/sentry/auth/helper.py @@ -21,7 +21,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from sentry import audit_log, features, options +from sentry import audit_log, features from sentry.api.invite_helper import ApiInviteHelper, remove_invite_details_from_session from sentry.audit_log.services.log import AuditLogEvent, log_service from sentry.auth.email import AmbiguousUserFromEmail, resolve_email_to_user @@ -451,11 +451,7 @@ def has_verified_account(self, verification_value: dict[str, Any]) -> bool: @property def _logged_in_user(self) -> User | None: """The user, if they have authenticated on this session.""" - if ( - options.get("demo-user.auth.pipelines.always.unauthenticated.enabled") - and is_demo_mode_enabled() - and is_demo_user(self.request.user) - ): + if is_demo_mode_enabled() and is_demo_user(self.request.user): return None return self.request.user if self.request.user.is_authenticated else None diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py index c1e13a1dbfbfd3..618ef980f763a4 100644 --- a/src/sentry/options/defaults.py +++ b/src/sentry/options/defaults.py @@ -3566,14 +3566,6 @@ flags=FLAG_AUTOMATOR_MODIFIABLE, ) -# Killswitch for treating demo user as unauthenticated -# in our auth pipelines. -register( - "demo-user.auth.pipelines.always.unauthenticated.enabled", - type=Bool, - default=False, - flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE, -) # Rate at which to forward events to eap_items. 1.0 # means that 100% of projects will forward events to eap_items. diff --git a/tests/sentry/web/frontend/test_auth_organization_login.py b/tests/sentry/web/frontend/test_auth_organization_login.py index 1d62057d6e784a..506d4fbffbbd6e 100644 --- a/tests/sentry/web/frontend/test_auth_organization_login.py +++ b/tests/sentry/web/frontend/test_auth_organization_login.py @@ -1349,7 +1349,6 @@ def test_demo_user_joins_existing_sso_organization(self) -> None: "demo-mode.enabled": True, "demo-mode.users": [self.demo_user.id], "demo-mode.orgs": [self.demo_org.id], - "demo-user.auth.pipelines.always.unauthenticated.enabled": True, } ): sso_org = self.create_organization(name="sso-org", owner=self.normal_user)