Browse Source

Update dj rest auth

David Burke 3 years ago
parent
commit
06ba54c961
3 changed files with 5 additions and 12 deletions
  1. 1 1
      glitchtip/settings.py
  2. 4 4
      users/tests/test.py
  3. 0 7
      users/utils.py

+ 1 - 1
glitchtip/settings.py

@@ -397,7 +397,7 @@ REST_AUTH_SERIALIZERS = {
 REST_AUTH_REGISTER_SERIALIZERS = {
     "REGISTER_SERIALIZER": "users.serializers.RegisterSerializer",
 }
-REST_AUTH_TOKEN_MODEL = "users.utils.NoopModel"
+REST_AUTH_TOKEN_MODEL = None
 REST_AUTH_TOKEN_CREATOR = "users.utils.noop_token_creator"
 
 # By default (False) only the first user may register and create an organization

+ 4 - 4
users/tests/test.py

@@ -18,7 +18,7 @@ class UserRegistrationTestCase(APITestCase):
             "password2": "hunter222",
         }
         res = self.client.post(url, data)
-        self.assertEqual(res.status_code, 201)
+        self.assertEqual(res.status_code, 204)
 
     def test_create_user_with_tags(self):
         url = reverse("rest_register")
@@ -29,7 +29,7 @@ class UserRegistrationTestCase(APITestCase):
             "tags": "?utm_campaign=test&utm_source=test&utm_medium=test&utm_medium=test",
         }
         res = self.client.post(url, data)
-        self.assertEqual(res.status_code, 201)
+        self.assertEqual(res.status_code, 204)
         self.assertTrue(
             User.objects.filter(analytics__register__utm_campaign="test").exists()
         )
@@ -45,12 +45,12 @@ class UserRegistrationTestCase(APITestCase):
         }
         org_data = {"name": "test"}
         res = self.client.post(url, data)
-        self.assertEqual(res.status_code, 201)
+        self.assertEqual(res.status_code, 204)
         baker.make("organizations_ext.Organization")
         data["email"] = "another@example.com"
         with override_settings(ENABLE_OPEN_USER_REGISTRATION=False):
             res = self.client.post(url, data)
-            self.assertEqual(res.status_code, 201)
+            self.assertEqual(res.status_code, 204)
             # Can't make more organizations outside of Django Admin
             user = User.objects.first()
             self.client.force_login(user)

+ 0 - 7
users/utils.py

@@ -12,10 +12,3 @@ def is_user_registration_open() -> bool:
 def noop_token_creator(token_model, user, serializer):
     """ Fake token creator to use sessions instead of tokens """
     return None
-
-
-class NoopModel:
-    """
-    dj-rest-auth doesn't officially support not having a Token model
-    But we can use this nothing class instead
-    """