Rebase with latest changes and fix tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/models.py

@@ -533,6 +533,7 @@ def create_api_user(self, username, first_name="", last_name="", **extra_fields)
             password=None,
             first_name=first_name,
             last_name=last_name,
+            **extra_fields,
         )
 
         # this ensure that this is not a valid password

vulnerabilities/tests/test_auth.py

@@ -24,9 +24,7 @@
 
 class VulnerableCodeAuthTest(TestCase):
     def setUp(self):
-        self.basic_user = ApiUser.objects.create_api_user(
-            username="basic_user@foo.com", password=TEST_PASSWORD
-        )
+        self.basic_user = ApiUser.objects.create_api_user(username="basic_user@foo.com")
 
     def test_vulnerablecode_auth_api_required_authentication(self):
         response = self.client.get(api_package_url)

vulnerabilities/tests/test_throttling.py

@@ -13,21 +13,19 @@
 from rest_framework.test import APIClient
 from rest_framework.test import APITestCase
 
-User = get_user_model()
+from vulnerabilities.models import ApiUser
 
 
 class ThrottleApiTests(APITestCase):
     def setUp(self):
         # create a basic user
-        self.user = User.objects.create_user("username", "e@mail.com", "secret")
+        self.user = ApiUser.objects.create_api_user(username="e@mail.com")
         self.auth = f"Token {self.user.auth_token.key}"
         self.csrf_client = APIClient(enforce_csrf_checks=True)
         self.csrf_client.credentials(HTTP_AUTHORIZATION=self.auth)
 
         # create a staff user
-        self.staff_user = User.objects.create_user(
-            "staff", "staff@mail.com", "secret", is_staff=True
-        )
+        self.staff_user = ApiUser.objects.create_api_user(username="staff@mail.com", is_staff=True)
         self.staff_auth = f"Token {self.staff_user.auth_token.key}"
         self.staff_csrf_client = APIClient(enforce_csrf_checks=True)
         self.staff_csrf_client.credentials(HTTP_AUTHORIZATION=self.staff_auth)