Refactor: Django admin always enabled (#1881)

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
   "service": "dev",
   "runServices": ["dev", "docs", "server"],
   "workspaceFolder": "/home/calitp/app",
-  "postStartCommand": ["/bin/bash", "bin/init.sh"],
+  "postStartCommand": ["/bin/bash", "bin/reset_db.sh"],
   "postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"],
   "customizations": {
     "vscode": {

.env.sample

@@ -1,3 +1,12 @@
+DJANGO_SUPERUSER_USERNAME=benefits-admin
+DJANGO_SUPERUSER_EMAIL=[email protected]
+DJANGO_SUPERUSER_PASSWORD=superuser12345!
+
+DJANGO_DB_RESET=true
+DJANGO_DB_DIR=.
+DJANGO_DB_FILE=django.db
+DJANGO_DB_FIXTURES="benefits/core/migrations/local_fixtures.json"
+
 testsecret=Hello from the local environment!
 auth_provider_client_id=benefits-oauth-client-id
 courtesy_card_verifier_api_auth_key=server-auth-token

.github/workflows/tests-cypress.yml

@@ -16,7 +16,8 @@ jobs:
       - name: Start app
         run: |
           cp .env.sample .env
-          docker compose up --detach client server
+          docker compose up --detach server
+          docker compose run --detach --service-ports client bin/test_start.sh
 
       - name: Run Cypress tests
         uses: cypress-io/github-action@v6

.gitignore

@@ -1,5 +1,7 @@
 *.db
 *.env
+*fixtures.json
+!benefits/core/migrations/local_fixtures.json
 *.mo
 *.tfbackend
 *.tmp

benefits/core/admin.py

@@ -2,43 +2,47 @@
 The core application: Admin interface configuration.
 """
 
+import logging
 import requests
 
 from django.conf import settings
-
-if settings.ADMIN:
-    import logging
-    from django.contrib import admin
-    from . import models
-
-    logger = logging.getLogger(__name__)
-
-    for model in [
-        models.EligibilityType,
-        models.EligibilityVerifier,
-        models.PaymentProcessor,
-        models.PemData,
-        models.TransitAgency,
-    ]:
-        logger.debug(f"Register {model.__name__}")
-        admin.site.register(model)
-
-    def pre_login_user(user, request):
-        logger.debug(f"Running pre-login callback for user: {user.username}")
-        token = request.session.get("google_sso_access_token")
-        if token:
-            headers = {
-                "Authorization": f"Bearer {token}",
-            }
-
-            # Request Google user info to get name and email
-            url = "https://www.googleapis.com/oauth2/v3/userinfo"
-            response = requests.get(url, headers=headers, timeout=settings.REQUESTS_TIMEOUT)
-            user_data = response.json()
-            logger.debug(f"Updating admin user data from Google for user with email: {user_data['email']}")
-
-            user.first_name = user_data["given_name"]
-            user.last_name = user_data["family_name"]
-            user.username = user_data["email"]
-            user.email = user_data["email"]
-            user.save()
+from django.contrib import admin
+from . import models
+
+logger = logging.getLogger(__name__)
+
+
+GOOGLE_USER_INFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo"
+
+
+for model in [
+    models.EligibilityType,
+    models.EligibilityVerifier,
+    models.PaymentProcessor,
+    models.PemData,
+    models.TransitAgency,
+]:
+    logger.debug(f"Register {model.__name__}")
+    admin.site.register(model)
+
+
+def pre_login_user(user, request):
+    logger.debug(f"Running pre-login callback for user: {user.username}")
+    token = request.session.get("google_sso_access_token")
+    if token:
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+
+        # Request Google user info to get name and email
+        response = requests.get(GOOGLE_USER_INFO_URL, headers=headers, timeout=settings.REQUESTS_TIMEOUT)
+        user_data = response.json()
+        logger.debug(f"Updating user data from Google for user with email: {user_data['email']}")
+
+        user.first_name = user_data["given_name"]
+        user.last_name = user_data["family_name"]
+        user.username = user_data["email"]
+        user.email = user_data["email"]
+        user.save()
+    else:
+        logger.warning("google_sso_access_token not found in session.")