Fix registration activation page

On branch 22.01.1
Changes to be committed:
	modified:   bco_api/api/scripts/method_specific/GET_activate_account.py
	new file:   bco_api/api/scripts/method_specific/__init__.py
	new file:   bco_api/api/scripts/utilities/__init__.py
	modified:   bco_api/api/templates/api/account_activation_message.html
	modified:   bco_api/api/views.py

Author: HadleyKing

bco_api/api/scripts/method_specific/GET_activate_account.py

@@ -1,89 +1,64 @@
-# For interacting with the database
-from ..utilities import DbUtils
+#!/usr/bin/env python3
+"""Activate Account
 
-# For the user lookup
-from django.contrib.auth.models import User
+"""
 
+from api.scripts.utilities import DbUtils
+
+# For url
+from django.conf import settings
 # Responses
 from rest_framework import status
 from rest_framework.response import Response
 
-
 # Source: https://codeloop.org/django-rest-framework-course-for-beginners/
 
-def GET_activate_account(
-        username,
-        temp_identifier
-        ):
-    # Activate an account that is stored in the temporary table.
+def GET_activate_account(username,temp_identifier):
+    """Activate Account
 
-    # Instantiate any necessary imports.
-    db = DbUtils.DbUtils()
+    Parameters
+    ----------
+    request: rest_framework.request.Request
+            Django request object.
 
-    # Does the account associated with this e-mail already
-    # exist in either a temporary or a permanent user profile?
-    # if User.objects.filter(email=username).exists():
-    #     # TODO: This doesn't work since the username is the prefix of the email plus a random seed
-    #     #       (so we can't actually check).  So this can only be true if there is a clash.
-    #     # Account has already been activated.
-    #     return (Response({
-    #                 'previously_activated': True,
-    #                 'username'          : username,
-    #                 'status'            : status.HTTP_208_ALREADY_REPORTED,
-    #             },
-    #             status=status.HTTP_208_ALREADY_REPORTED)
-    #     )
+    Returns
+    -------
+    rest_framework.response.Response
+        An HttpResponse that allows its data to be rendered into
+        arbitrary media types.
+    """
+    # Activate an account that is stored in the temporary table.
+
+    db_utils = DbUtils.DbUtils()
 
     # The account has not been activated, but does it exist
     # in the temporary table?
-    if db.check_activation_credentials(
+    if db_utils.check_activation_credentials(
             p_app_label='api',
             p_model_name='new_users',
             p_email=username,
             p_temp_identifier=temp_identifier
-            ) == 1:
-
+            ):
 
         # The credentials match, so activate the account.
-        credential_try = db.activate_account(
-                p_email=username
-                )
+        credential_try = db_utils.activate_account(p_email=username)
 
         if len(credential_try) > 0:
             # Everything went fine.
-            return (
-                    Response(
-                            {
-                                    'activation_success': True,
-                                    'username'          : credential_try[0],
-                                    'status': status.HTTP_201_CREATED,
-
-                                    },
-                            status=status.HTTP_201_CREATED
-                            )
-            )
-
-        else:
-
-            # The credentials weren't good.
-            return (
-                    Response(
-                            {
-                                    'activation_success': False,
-                                    'status'            : status.HTTP_403_FORBIDDEN
-                                    },
-                            status=status.HTTP_403_FORBIDDEN
-                            )
-            )
-
-    else:
-
-        return (
-                Response(
-                        {
-                                'activation_success': False,
-                                'status'            : status.HTTP_424_FAILED_DEPENDENCY
-                                },
-                        status=status.HTTP_424_FAILED_DEPENDENCY
-                        )
-        )
+            return (Response({
+                'activation_success': True,
+                'activation_url': settings.PUBLIC_HOSTNAME+'/login/',
+                'username': credential_try[0],
+                'status': status.HTTP_201_CREATED,
+                }, status=status.HTTP_201_CREATED))
+
+        # The credentials weren't good.
+        return(Response({
+                    'activation_success': False,
+                    'status' : status.HTTP_403_FORBIDDEN},
+                    status=status.HTTP_403_FORBIDDEN))
+
+    return(Response({
+        'activation_success': False,
+        'status': status.HTTP_424_FAILED_DEPENDENCY},
+        status=status.HTTP_424_FAILED_DEPENDENCY))

bco_api/api/scripts/method_specific/__init__.py

@@ -34,7 +34,7 @@
         {% else %}
             <p>Unsuccessful activation!  The account may not have been requested or may have already been activated.  Please request another activation e-mail on the Portal.</p>
         {% endif %}
-            <button type = 'button'><a href = 'http://beta.portal.aws.biochemistry.gwu.edu/login/' target = '_blank'>Open Portal in new tab</a></button>
+            <button type = 'button'><a href = {{ activation_url }}>Open Portal in new tab</a></button>
         </div>
   </body>
 </html>

bco_api/api/scripts/utilities/__init__.py

@@ -412,7 +412,6 @@ class ApiAccountsNew(APIView):
             500: "Unable to save the new account or send authentication email."
             }, tags=["Account Management"])
     def post(self, request) -> Response:
-        import pdb; pdb.set_trace()
         print("Request: {}".format(request))
         return check_post_and_process(request, POST_api_accounts_new)