Test secrets debug

.github/workflows/django.yml

@@ -13,36 +13,66 @@ jobs:
       max-parallel: 4
       matrix:
         python-version: [3.9]
+    environment: Testing  # Specify the environment here
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Debugging Step
+
+      - name: Create secrets file
         run: |
-            ls -R server # List all files and directories recursively
-            cat server/requirements.txt  # Print the contents of the requirements file
-
+          echo "::add-mask::${{ secrets.SECRET_KEY }}"
+          echo "SECRET_KEY=${{ secrets.SECRET_KEY }}" >> server/.env
+          echo "DJANGO_GOOGLE_OAUTH2_CLIENT_ID=${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_ID }}" >> server/.env
+          echo "DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET=${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET }}" >> server/.env
+          echo "DJANGO_ORCID_OAUTH2_CLIENT_URL=${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_URL }}" >> server/.env
+          echo "DJANGO_ORCID_OAUTH2_CLIENT_ID=${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_ID }}" >> server/.env
+          echo "DJANGO_ORCID_OAUTH2_CLIENT_SECRET=${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_SECRET }}" >> server/.env
+          echo "DJANGO_ORCID_OAUTH2_URL=${{ secrets.DJANGO_ORCID_OAUTH2_URL }}" >> server/.env
+          echo "SERVER_VERSION=${{ secrets.SERVER_VERSION }}" >> server/.env
+          echo "SERVER_URL=${{ secrets.SERVER_URL }}" >> server/.env
+          echo "DATABASE=${{ secrets.DATABASE }}" >> server/.env
+          echo "EMAIL_BACKEND=${{ secrets.EMAIL_BACKEND }}" >> server/.env
+
+      - name: Debug Secrets
+        run: |
+          cat server/.env
+
+      - name: Export Environment Variables
+        run: |
+          set -a
+          source server/.env
+          set +a
+        shell: bash
+
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r server/requirements.txt
+
       - name: Run Tests
-        env:
-            SECRET_KEY: ${{ secrets.SECRET_KEY }}
-            DJANGO_GOOGLE_OAUTH2_CLIENT_ID: ${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_ID }}
-            DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET: ${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET }}
-            DJANGO_ORCID_OAUTH2_CLIENT_URL: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_URL }}
-            DJANGO_ORCID_OAUTH2_CLIENT_ID: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_ID }}
-            DJANGO_ORCID_OAUTH2_CLIENT_SECRET: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_SECRET }}
-            DJANGO_ORCID_OAUTH2_URL: ${{ secrets.DJANGO_ORCID_OAUTH2_URL }}
-            SERVER_VERSION: ${{ secrets.SERVER_VERSION }}
-            SERVER_URL: ${{ secrets.SERVER_URL }}
-            DATABASE: ${{ secrets.DATABASE }}
-
         run: |
           cd server  # Change to the subdirectory
           python3.9 manage.py test
+
+        env:
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+          DJANGO_GOOGLE_OAUTH2_CLIENT_ID: ${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_ID }}
+          DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET: ${{ secrets.DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET }}
+          DJANGO_ORCID_OAUTH2_CLIENT_URL: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_URL }}
+          DJANGO_ORCID_OAUTH2_CLIENT_ID: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_ID }}
+          DJANGO_ORCID_OAUTH2_CLIENT_SECRET: ${{ secrets.DJANGO_ORCID_OAUTH2_CLIENT_SECRET }}
+          DJANGO_ORCID_OAUTH2_URL: ${{ secrets.DJANGO_ORCID_OAUTH2_URL }}
+          SERVER_VERSION: ${{ secrets.SERVER_VERSION }}
+          SERVER_URL: ${{ secrets.SERVER_URL }}
+          DATABASE: ${{ secrets.DATABASE }}
+          EMAIL_BACKEND: ${{ secrets.EMAIL_BACKEND }}
+
+      - name: Clean up
+        run: |
+          rm server/.env

client/.env.example

@@ -5,4 +5,4 @@ REACT_APP_ORCID_URL=
 REACT_APP_ORCID_CLIENT_ID=
 REACT_APP_ORCID_CLIENT_SECRET=
 REACT_APP_SERVER_URL=
-REACT_APP_BCOAPI_TOKEN=
+REACT_APP_BCOAPI_TOKEN=

server/config/settings.py

@@ -7,7 +7,10 @@
 from datetime import timedelta
 import configparser
 from django.core.management.utils import get_random_secret_key
+from dotenv import load_dotenv
 
+# Load environment variables from .env file
+load_dotenv()
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -40,6 +43,12 @@
         "DATABASE": os.environ.get("DATABASE"),
     },
 }
+
+# Handle cases where the environment variables are not set
+for key, value in secrets.items():
+    if value is None:
+        secrets[key] = {}
+
 if secrets["DJANGO_KEYS"]["SECRET_KEY"] == None:
     secrets = configparser.ConfigParser()
     secrets.read(BASE_DIR + "/.secrets")

server/portaluserdb/settings.py

@@ -8,6 +8,8 @@
 import configparser
 from django.core.management.utils import get_random_secret_key
 
+
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -38,6 +40,8 @@
         "SERVER_VERSION": os.environ.get("SERVER_VERSION"),
         "SERVER_URL": os.environ.get("SERVER_URL"),
         "DATABASE": os.environ.get("DATABASE"),
+        "EMAIL_BACKEND": os.environ.get("EMAIL_BACKEND", "django.core.mail.backends.console.EmailBackend"),
+
     },
 }
 if secrets["DJANGO_KEYS"]["SECRET_KEY"] == None:
@@ -67,8 +71,18 @@
     GOOGLE_CLIENT = secrets["GOOGLE_KEYS"]["DJANGO_GOOGLE_OAUTH2_CLIENT_ID"]
 if secrets["GOOGLE_KEYS"]["DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET"]:
     GOOGLE_SECRET = secrets["GOOGLE_KEYS"]["DJANGO_GOOGLE_OAUTH2_CLIENT_SECRET"]
+if secrets["SERVER"]["EMAIL_BACKEND"]:
+    EMAIL_BACKEND = secrets["SERVER"]["EMAIL_BACKEND"]
+try:
+    EMAIL_BACKEND = secrets["SERVER"]["EMAIL_BACKEND"]
+except KeyError:
+    raise KeyError("EMAIL_BACKEND not found in secrets")
+
+
 
-EMAIL_BACKEND = secrets["SERVER"]["EMAIL_BACKEND"]
+# Use print statements for debugging
+print(f"Secrets: {secrets}")
+print(f"EMAIL_BACKEND: {EMAIL_BACKEND}")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

server/requirements.txt

@@ -43,3 +43,4 @@ typing_extensions==4.5.0
 tzdata==2023.3
 uritemplate==4.1.1
 urllib3==1.26.1
+python-dotenv