|
@@ -497,15 +497,6 @@ class AuthLoginNewsletterTest(TestCase):
|
|
|
assert not results[0].verified
|
|
|
|
|
|
|
|
|
-def provision_middleware():
|
|
|
-
|
|
|
- middleware = list(settings.MIDDLEWARE)
|
|
|
- if "sentry.middleware.customer_domain.CustomerDomainMiddleware" not in middleware:
|
|
|
- index = middleware.index("sentry.middleware.auth.AuthenticationMiddleware")
|
|
|
- middleware.insert(index + 1, "sentry.middleware.customer_domain.CustomerDomainMiddleware")
|
|
|
- return middleware
|
|
|
-
|
|
|
-
|
|
|
@control_silo_test(stable=True)
|
|
|
@override_settings(
|
|
|
SENTRY_USE_CUSTOMER_DOMAINS=True,
|
|
@@ -596,55 +587,52 @@ class AuthLoginCustomerDomainTest(TestCase):
|
|
|
with self.disable_registration():
|
|
|
self.create_organization(name="albertos-apples", owner=self.user)
|
|
|
|
|
|
- with override_settings(MIDDLEWARE=tuple(provision_middleware())):
|
|
|
-
|
|
|
- self.client.get(self.path)
|
|
|
- resp = self.client.post(
|
|
|
- self.path,
|
|
|
- {"username": self.user.username, "password": "admin", "op": "login"},
|
|
|
-
|
|
|
-
|
|
|
- SERVER_NAME="invalid.testserver",
|
|
|
- follow=True,
|
|
|
- )
|
|
|
-
|
|
|
- assert resp.status_code == 200
|
|
|
- assert resp.redirect_chain == [
|
|
|
- ("http://invalid.testserver/auth/login/", 302),
|
|
|
- ("http://albertos-apples.testserver/auth/login/", 302),
|
|
|
- ("http://albertos-apples.testserver/issues/", 302),
|
|
|
- ]
|
|
|
+
|
|
|
+ self.client.get(self.path)
|
|
|
+ resp = self.client.post(
|
|
|
+ self.path,
|
|
|
+ {"username": self.user.username, "password": "admin", "op": "login"},
|
|
|
+
|
|
|
+
|
|
|
+ SERVER_NAME="invalid.testserver",
|
|
|
+ follow=True,
|
|
|
+ )
|
|
|
+
|
|
|
+ assert resp.status_code == 200
|
|
|
+ assert resp.redirect_chain == [
|
|
|
+ ("http://invalid.testserver/auth/login/", 302),
|
|
|
+ ("http://albertos-apples.testserver/auth/login/", 302),
|
|
|
+ ("http://albertos-apples.testserver/issues/", 302),
|
|
|
+ ]
|
|
|
|
|
|
def test_login_valid_credentials_non_staff(self):
|
|
|
with self.disable_registration():
|
|
|
org = self.create_organization(name="albertos-apples")
|
|
|
non_staff_user = self.create_user(is_staff=False)
|
|
|
self.create_member(organization=org, user=non_staff_user)
|
|
|
- with override_settings(MIDDLEWARE=tuple(provision_middleware())):
|
|
|
-
|
|
|
- self.client.get(self.path)
|
|
|
-
|
|
|
- resp = self.client.post(
|
|
|
- self.path,
|
|
|
- {"username": non_staff_user.username, "password": "admin", "op": "login"},
|
|
|
-
|
|
|
-
|
|
|
- SERVER_NAME="albertos-apples.testserver",
|
|
|
- follow=True,
|
|
|
- )
|
|
|
- assert resp.status_code == 200
|
|
|
- assert resp.redirect_chain == [
|
|
|
- ("http://albertos-apples.testserver/auth/login/", 302),
|
|
|
- ("http://albertos-apples.testserver/issues/", 302),
|
|
|
- ]
|
|
|
+
|
|
|
+
|
|
|
+ self.client.get(self.path)
|
|
|
+
|
|
|
+ resp = self.client.post(
|
|
|
+ self.path,
|
|
|
+ {"username": non_staff_user.username, "password": "admin", "op": "login"},
|
|
|
+
|
|
|
+
|
|
|
+ SERVER_NAME="albertos-apples.testserver",
|
|
|
+ follow=True,
|
|
|
+ )
|
|
|
+ assert resp.status_code == 200
|
|
|
+ assert resp.redirect_chain == [
|
|
|
+ ("http://albertos-apples.testserver/auth/login/", 302),
|
|
|
+ ("http://albertos-apples.testserver/issues/", 302),
|
|
|
+ ]
|
|
|
|
|
|
def test_login_valid_credentials_not_a_member(self):
|
|
|
user = self.create_user()
|
|
|
self.create_organization(name="albertos-apples")
|
|
|
self.create_member(organization=self.organization, user=user)
|
|
|
- with override_settings(
|
|
|
- MIDDLEWARE=tuple(provision_middleware())
|
|
|
- ), self.disable_registration():
|
|
|
+ with self.disable_registration():
|
|
|
|
|
|
self.client.get(self.path)
|
|
|
|
|
@@ -667,9 +655,7 @@ class AuthLoginCustomerDomainTest(TestCase):
|
|
|
def test_login_valid_credentials_orgless(self):
|
|
|
user = self.create_user()
|
|
|
self.create_organization(name="albertos-apples")
|
|
|
- with override_settings(
|
|
|
- MIDDLEWARE=tuple(provision_middleware())
|
|
|
- ), self.disable_registration():
|
|
|
+ with self.disable_registration():
|
|
|
|
|
|
self.client.get(self.path)
|
|
|
|
|
@@ -688,9 +674,7 @@ class AuthLoginCustomerDomainTest(TestCase):
|
|
|
|
|
|
def test_login_valid_credentials_org_does_not_exist(self):
|
|
|
user = self.create_user()
|
|
|
- with override_settings(
|
|
|
- MIDDLEWARE=tuple(provision_middleware())
|
|
|
- ), self.disable_registration():
|
|
|
+ with self.disable_registration():
|
|
|
|
|
|
self.client.get(self.path)
|
|
|
|