Create NewUser model and remove new_user model

changed model behind `/api/accounts/new/`
Changes to be committed:
	modified:   api/admin.py
	new file:   api/migrations/0006_delete_new_users.py
	modified:   api/models.py
	deleted:    api/scripts/method_specific/POST_api_accounts_new.py
	modified:   api/urls.py
	modified:   api/views.py
	modified:   authentication/admin.py
	modified:   authentication/apis.py
	new file:   authentication/migrations/0002_newuser.py
	modified:   authentication/models.py
	modified:   authentication/selectors.py
	modified:   authentication/services.py
	modified:   tests/fixtures/test_data.json
	modified:   tests/test_views/test_api_account_activate.py
	modified:   tests/test_views/test_api_account_new.py

Author: HadleyKing

api/admin.py

@@ -5,16 +5,13 @@
 """
 
 from django.contrib import admin
-from guardian.admin import GuardedModelAdmin
-from api.models import BCO, new_users
+from api.models import BCO
 from api.model.prefix import Prefix, prefix_table
 from api.model.groups import GroupInfo
 
 class BcoModelAdmin(admin.ModelAdmin):
     search_fields = ["contents", "object_id"]
 admin.site.register(BCO, BcoModelAdmin)
-# admin.site.register(
 admin.site.register(prefix_table)
-admin.site.register(new_users)
 admin.site.register(GroupInfo)
 admin.site.register(Prefix)

api/migrations/0006_delete_new_users.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.13 on 2024-03-07 21:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0005_rename_prefixes_prefix'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='new_users',
+        ),
+    ]

api/models.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """Models
 
 Explanation of optional fields: 
@@ -71,43 +72,6 @@ def __str__(self):
         """String for representing the BCO model (in Admin site etc.)."""
         return str(self.object_id)
 
-
-# For registering new users.
-class new_users(models.Model):
-    """Instead of using the User model, just use
-    a crude table to store the temporary information
-    when someone asks for a new account."""
-
-    email = models.EmailField()
-    temp_identifier = models.TextField(max_length=100)
-    # In case we are writing back to UserDB.
-    token = models.TextField(blank=True, null=True)
-
-    # Which host to send the activation back to (i.e. UserDB).
-    hostname = models.TextField(blank=True, null=True)
-    # Issue with time zone, so implement the fix.
-    # Source: https://stackoverflow.com/a/32411560
-    created = models.DateTimeField(default=timezone.now)
-
-    def __email__(self):
-        return str(self.email)
-
-    def __token__(self):
-        return str(self.token)
-
-    def __hostname__(self):
-        return str(self.hostname)
-
-    def __temp_identifier__(self):
-        return str(self.temp_identifier)
-
-
-# def get_first_name(self):
-#     return self.first_name
-
-# User.add_to_class("__str__", get_first_name)
-
-
 # --- Receivers --- #
 
 

api/scripts/method_specific/POST_api_accounts_new.py

@@ -20,7 +20,6 @@
 from api.views import (
     ApiAccountsActivateUsernameTempIdentifier,
     ApiAccountsDescribe,
-    ApiAccountsNew,
     ApiGroupsCreate,
     ApiGroupsInfo,
     ApiGroupsDelete,
@@ -133,7 +132,6 @@
             ApiAccountsActivateUsernameTempIdentifier.as_view(),
         ),
         path("api/accounts/describe/", ApiAccountsDescribe.as_view()),
-        path("api/accounts/new/", ApiAccountsNew.as_view()),
         path("api/groups/group_info/", ApiGroupsInfo.as_view()),
         path("api/groups/create/", ApiGroupsCreate.as_view()),
         path("api/groups/delete/", ApiGroupsDelete.as_view()),

api/urls.py

@@ -45,7 +45,6 @@
 from api.scripts.method_specific.POST_api_accounts_describe import (
     POST_api_accounts_describe,
 )
-from api.scripts.method_specific.POST_api_accounts_new import POST_api_accounts_new
 from api.scripts.method_specific.POST_api_objects_drafts_create import (
     post_api_objects_drafts_create,
 )
@@ -516,67 +515,6 @@ class ApiGroupsModify(APIView):
     def post(self, request):
         return check_post_and_process(request, post_api_groups_modify)
 
-
-class ApiAccountsNew(APIView):
-    """
-    Account creation request
-
-    --------------------
-
-    Ask for a new account.  Sends an e-mail to the provided e-mail, which must
-    then be clicked to activate the account.
-
-    The account create depends on creation of an account in the associated
-    user database.  The authentication as well as the user database host
-    information is used to make this request.
-
-    ```JSON
-    {
-      "hostname": "http://localhost:8000",
-      "email": "[email protected]",
-      "token": "eyJ1c2VyX2lkIjoyNCwidXNlcm5hbWUiOiJoYWRsZXlraW5nIiwiZXhwIjoxNjQwNzE5NTUwLCJlbWFpbCI6ImhhZGxleV9raW5nQGd3dS5lZHUiLCJvcmlnX2lhdCI6MTY0MDExNDc1MH0.7G3VPmxUBOWFfu-fMt1_UsWAcH_Gd1DfpQa83EwFwYY"
-    }
-    ```
-    """
-
-    # Anyone can ask for a new account
-    authentication_classes = []
-    permission_classes = []
-
-    request_body = openapi.Schema(
-        type=openapi.TYPE_OBJECT,
-        title="Account Creation Schema",
-        description="Account creation schema description.",
-        required=["hostname", "email", "token"],
-        properties={
-            "hostname": openapi.Schema(
-                type=openapi.TYPE_STRING, description="Hostname of the User Database."
-            ),
-            "email": openapi.Schema(
-                type=openapi.TYPE_STRING, description="Email address of user."
-            ),
-            "token": openapi.Schema(
-                type=openapi.TYPE_STRING,
-                description="Token returned with new user being "
-                "generated in the User Database.",
-            ),
-        },
-    )
-
-    @swagger_auto_schema(
-        request_body=request_body,
-        responses={
-            201: "Account creation request is successful.",
-            400: "Bad request format.",
-            409: "Account has already been authenticated or requested.",
-        },
-        tags=["Account Management"],
-    )
-    def post(self, request) -> Response:
-        print("Request: {}".format(request))
-        return check_post_and_process(request, POST_api_accounts_new)
-
-
 class ApiObjectsDraftsCreate(APIView):
     """
     Create BCO Draft

api/views.py

@@ -2,6 +2,13 @@
 """
 
 from django.contrib import admin
-from authentication.models import Authentication
+from authentication.models import Authentication, NewUser
 
-admin.site.register(Authentication)
+class AuthenticationAdmin(admin.ModelAdmin):
+    list_display = ["username", "auth_service"]
+
+class NewUserAdmin(admin.ModelAdmin):
+    list_display = ["email", "temp_identifier","token", "hostname", "created"]
+
+admin.site.register(Authentication, AuthenticationAdmin)
+admin.site.register(NewUser, NewUserAdmin)