Merge pull request #3482 from GSA-TTS/main

GSA-TTS · Mar 5, 2024 · 9ee4a66 · 9ee4a66
2 parents 0bbc05a + 79f56d7
commit 9ee4a66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
@@ -28,7 +28,12 @@ jobs:
     environment: ${{ inputs.environment }}
     env:
       CYPRESS_API_GOV_KEY: ${{ secrets.CYPRESS_API_GOV_KEY }}
+      CYPRESS_API_GOV_USER_ID: ${{ secrets.CYPRESS_API_GOV_USER_ID }}
+      CYPRESS_API_GOV_KEY_ADMIN: ${{ secrets.CYPRESS_API_GOV_KEY_ADMIN }}
+      CYPRESS_API_GOV_USER_ID_ADMIN: ${{ secrets.CYPRESS_API_GOV_USER_ID_ADMIN }}
       CYPRESS_API_GOV_URL: ${{ secrets.CYPRESS_API_GOV_URL }}
+      CYPRESS_API_VERSION: ${{ secrets.CYPRESS_API_VERSION }}
+      CYPRESS_ADMIN_API_VERSION: ${{ secrets.CYPRESS_ADMIN_API_VERSION }}
       CYPRESS_BASE_URL: ${{ inputs.url }}
       CYPRESS_LOGIN_TEST_EMAIL: ${{ secrets.CYPRESS_LOGIN_TEST_EMAIL }}
       CYPRESS_LOGIN_TEST_PASSWORD: ${{ secrets.CYPRESS_LOGIN_TEST_PASSWORD }}

diff --git a/backend/cypress/support/dissemination-table.js b/backend/cypress/support/dissemination-table.js
@@ -4,6 +4,8 @@
 
 const API_GOV_JWT = Cypress.env('API_GOV_JWT') || '';
 const API_GOV_KEY = Cypress.env('API_GOV_KEY') || '';
+const API_GOV_USER_ID = Cypress.env('API_GOV_USER_ID');
+const API_GOV_KEY_ADMIN = Cypress.env('API_GOV_KEY_ADMIN');
 const API_GOV_USER_ID_ADMIN = Cypress.env('API_GOV_USER_ID_ADMIN');
 const API_GOV_URL = Cypress.env('API_GOV_URL');
 const API_VERSION = Cypress.env('API_VERSION');
@@ -25,7 +27,7 @@ function grantTribalAccess(email, user_id) {
     url: `${API_GOV_URL}/rpc/add_tribal_api_key_access`,
     headers: {
       Authorization: `Bearer ${API_GOV_JWT}`,
-      'X-Api-Key': API_GOV_KEY,
+      'X-Api-Key': API_GOV_KEY_ADMIN,
       'X-Api-User-Id': API_GOV_USER_ID_ADMIN,
       'Content-Profile': ADMIN_API_VERSION,
       'Content-Type': 'application/json',
@@ -47,7 +49,7 @@ function revokeTribalAccess(email, user_id) {
     url: `${API_GOV_URL}/rpc/remove_tribal_api_key_access`,
     headers: {
       Authorization: `Bearer ${API_GOV_JWT}`,
-      'X-Api-Key': API_GOV_KEY,
+      'X-Api-Key': API_GOV_KEY_ADMIN,
       'X-Api-User-Id': API_GOV_USER_ID_ADMIN,
       'Content-Profile': ADMIN_API_VERSION,
       'Content-Type': 'application/json',
@@ -84,7 +86,7 @@ export function testReportIdFoundWithoutTribalAccess(reportId) {
 
 export function testReportIdFoundWithTribalAccess(reportId) {
   const tribal_access_email = `${crypto.randomUUID()}@example.com`;
-  const tribal_access_user_id = crypto.randomUUID();
+  const tribal_access_user_id = API_GOV_USER_ID;
 
   grantTribalAccess(tribal_access_email, tribal_access_user_id);
 
@@ -110,7 +112,7 @@ export function testReportIdFoundWithTribalAccess(reportId) {
 
 export function testReportIdNotFoundWithTribalAccess(reportId) {
   const tribal_access_email = `${crypto.randomUUID()}@example.com`;
-  const tribal_access_user_id = crypto.randomUUID();
+  const tribal_access_user_id = API_GOV_USER_ID;
 
   grantTribalAccess(tribal_access_email, tribal_access_user_id);