Merge pull request #87 from wri/fix/auth-wrong-env-var

Auth - Wrong env var name
wri · Nov 9, 2023 · ccfe62c · ccfe62c
2 parents fd0db49 + 9baab14
commit ccfe62c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -51,6 +51,7 @@ jobs:
           --build-arg NEXTAUTH_SECRET=${{ secrets.DEV_FRONTEND_NEXTAUTH_SECRET }} \
           --build-arg NEXTAUTH_URL=${{ secrets.DEV_FRONTEND_NEXTAUTH_URL }} \
           --build-arg CKAN_URL=${{ secrets.DEV_FRONTEND_CKAN_URL }} \
+          --build-arg SYS_ADMIN_API_KEY=${{ secrets.SYS_ADMIN_API_KEY }} \
           deployment/frontend
           docker push $REGISTRY/$FRONTEND_REPO:$IMAGE_TAG
       - name: Set up Docker Containers

diff --git a/ckan-backend-dev/docker-compose.dev.yml b/ckan-backend-dev/docker-compose.dev.yml
@@ -46,7 +46,7 @@ services:
         - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
         - S3_BUCKET_NAME=ckan
         - S3_BUCKET_REGION=us-east-1
-        - SYS_ADMIN_API_KEY=${CKAN__DATAPUSHER__API_TOKEN}
+        - SYS_ADMIN_API_KEY=${SYS_ADMIN_API_KEY}
     environment:
       - NEXTAUTH_SECRET=secret
       - NEXTAUTH_URL=http://localhost:3000
@@ -55,7 +55,7 @@ services:
       - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
       - S3_BUCKET_NAME=ckan
       - S3_BUCKET_REGION=us-east-1
-      - SYS_ADMIN_API_KEY=${CKAN__DATAPUSHER__API_TOKEN}
+      - SYS_ADMIN_API_KEY=${SYS_ADMIN_API_KEY}
     ports:
       - "0.0.0.0:3000:3000"
     healthcheck:

diff --git a/ckan-backend-dev/docker-compose.test.yml b/ckan-backend-dev/docker-compose.test.yml
@@ -52,7 +52,7 @@ services:
       - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
       - S3_BUCKET_NAME=ckan
       - S3_BUCKET_REGION=us-east-1
-      - SYS_ADMIN_API_KEY=${CKAN__DATAPUSHER__API_TOKEN}
+      - SYS_ADMIN_API_KEY=${SYS_ADMIN_API_KEY}
     ports:
       - "0.0.0.0:3000:3000"
     healthcheck:

diff --git a/deployment/frontend/Dockerfile b/deployment/frontend/Dockerfile
@@ -6,6 +6,7 @@ WORKDIR /usr/src/app
 ARG NEXTAUTH_SECRET
 ARG NEXTAUTH_URL
 ARG CKAN_URL
+ARG SYS_ADMIN_API_KEY
 
 COPY . .
 

diff --git a/e2e-tests/cypress/e2e/auth.cy.js b/e2e-tests/cypress/e2e/auth.cy.js
@@ -38,7 +38,6 @@ describe("Login modal", () => {
 
     cy.get("#request-reset-button").click();
 
-    // cy.contains("Password reset link sent to email address");
   });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ describe("Login modal", () => { @@
         cy.get("#request-reset-button").click();
-        // cy.contains("Password reset link sent to email address");
       });
     });
@@ Expand Down @@