From caf390b23f6d88a085fdc27953dd87f3fb0d58f7 Mon Sep 17 00:00:00 2001
From: Greg Barnes <gregdbarnes@gmail.com>
Date: Wed, 11 Sep 2024 17:51:00 +0100
Subject: [PATCH] Adds back in django admin and auth functionality

---
 Makefile                    |  6 +++++
 local.env.example           |  2 +-
 orp/config/settings/base.py | 50 ++++++++++++++++---------------------
 orp/core/admin.py           | 10 +++-----
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 0cc0e4d..0b2ff08 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,12 @@ django-shell-local: # Run a Django shell (local django instance)
 		DJANGO_SETTINGS_MODULE=config.settings.local \
 		poetry run python orp/manage.py shell
 
+migrate: # Run Django migrate
+	docker compose run --rm web poetry run python orp/manage.py migrate --noinput
+
+migrations: # Run Django makemigrations
+	docker compose run --rm web poetry run python orp/manage.py makemigrations --noinput
+
 lint: # Run all linting
 	make black
 	make isort
diff --git a/local.env.example b/local.env.example
index a598efd..3d2dad8 100644
--- a/local.env.example
+++ b/local.env.example
@@ -5,7 +5,7 @@
 # Django Settings
 ALLOWED_HOSTS=localhost
 DEBUG=True
-DJANGO_ADMIN=False
+DJANGO_ADMIN=True
 DJANGO_SETTINGS_MODULE=config.settings.local
 DJANGO_SECRET_KEY=orp-secret
 
diff --git a/orp/config/settings/base.py b/orp/config/settings/base.py
index 369b35b..99f631b 100644
--- a/orp/config/settings/base.py
+++ b/orp/config/settings/base.py
@@ -45,8 +45,8 @@
 
 # Application definition
 DJANGO_APPS = [
-    # "django.contrib.admin",
-    # "django.contrib.auth",
+    "django.contrib.admin",
+    "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
@@ -70,7 +70,7 @@
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
-    # "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
@@ -90,19 +90,13 @@
             "context_processors": [
                 "django.template.context_processors.debug",
                 "django.template.context_processors.request",
-                # "django.contrib.auth.context_processors.auth",
+                "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
             ],
         },
     },
 ]
 
-# TODO: Add auth backends?
-# AUTHENTICATION_BACKENDS = [
-#     "config.backends.CustomAxesBackend",
-#     "django.contrib.auth.backends.ModelBackend",
-# ]
-
 WSGI_APPLICATION = "config.wsgi.application"
 
 DATABASES: dict = {}
@@ -125,20 +119,20 @@
         }
     }
 
-# AUTH_PASSWORD_VALIDATORS = [
-#     {
-#         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",  # noqa: E501
-#     },
-#     {
-#         "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",  # noqa: E501
-#     },
-#     {
-#         "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",  # noqa: E501
-#     },
-#     {
-#         "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",  # noqa: E501
-#     },
-# ]
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",  # noqa: E501
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",  # noqa: E501
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",  # noqa: E501
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",  # noqa: E501
+    },
+]
 
 # Internationalisation
 LANGUAGE_CODE = "en-gb"
@@ -250,12 +244,12 @@
 # )
 
 # Pagination
-RESULTS_PER_PAGE = 10
+# RESULTS_PER_PAGE = 10
 
 # GOV Notify
-GOV_NOTIFY_API_KEY = env.str("GOV_NOTIFY_API_KEY", default=None)
-GOV_NOTIFY_TESTING_KEY = env.str("GOV_NOTIFY_TESTING_KEY", default=None)
-DISABLE_NOTIFY_WHITELIST = env.bool("DISABLE_NOTIFY_WHITELIST", default=False)
+# GOV_NOTIFY_API_KEY = env.str("GOV_NOTIFY_API_KEY", default=None)
+# GOV_NOTIFY_TESTING_KEY = env.str("GOV_NOTIFY_TESTING_KEY", default=None)
+# DISABLE_NOTIFY_WHITELIST = env.bool("DISABLE_NOTIFY_WHITELIST", default=False)  # noqa: E501
 
 # HOSTNAME
 HOSTNAME_MAP = {
diff --git a/orp/core/admin.py b/orp/core/admin.py
index e5904a2..d6ce8b8 100644
--- a/orp/core/admin.py
+++ b/orp/core/admin.py
@@ -1,7 +1,3 @@
-# from django.contrib import admin
-
-# from core.models import Confirmation, ContractDetail, Report
-
-# admin.site.register(Confirmation)
-# admin.site.register(ContractDetail)
-# admin.site.register(Report)
+"""
+TODO: Register models when available
+"""