Merge pull request #534 from USEPA/feature/add-bap-api-version-env

Feature/add bap api version env
USEPA · Jan 17, 2025 · 47259aa · 47259aa
2 parents 3132d68 + c06bfec
commit 47259aa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -75,6 +75,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      BAP_REST_API_VERSION: ${{ secrets.BAP_REST_API_VERSION }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -177,6 +178,7 @@ jobs:
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
+          cf set-env $APP_NAME "BAP_REST_API_VERSION" "$BAP_REST_API_VERSION" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null
           cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -75,6 +75,7 @@ jobs:
       FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
+      BAP_REST_API_VERSION: ${{ secrets.BAP_REST_API_VERSION }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
       BAP_URL: ${{ secrets.BAP_URL }}
@@ -177,6 +178,7 @@ jobs:
           cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
           cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
+          cf set-env $APP_NAME "BAP_REST_API_VERSION" "$BAP_REST_API_VERSION" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null
           cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null

diff --git a/app/server/.env.example b/app/server/.env.example
@@ -43,7 +43,7 @@ FORMIO_2024_CHANGE_PATH=
 FORMIO_BASE_URL=
 FORMIO_PROJECT_NAME=
 FORMIO_API_KEY=
-FORMIO_DUPLICATES_API_KEY=
+BAP_REST_API_VERSION=
 BAP_CLIENT_ID=
 BAP_CLIENT_SECRET=
 BAP_URL=

diff --git a/app/server/app/index.js b/app/server/app/index.js
@@ -62,6 +62,12 @@ const requiredEnvironmentVariables = [
   "FORMIO_BASE_URL",
   "FORMIO_PROJECT_NAME",
   "FORMIO_API_KEY",
+  "BAP_REST_API_VERSION",
+  "BAP_CLIENT_ID",
+  "BAP_CLIENT_SECRET",
+  "BAP_URL",
+  "BAP_USER",
+  "BAP_PASSWORD",
   "S3_PUBLIC_BUCKET",
   "S3_PUBLIC_REGION",
 ];

diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
@@ -453,6 +453,7 @@ const { submissionPeriodOpen } = require("../config/formio");
 
 const {
   SERVER_URL,
+  BAP_REST_API_VERSION,
   BAP_CLIENT_ID,
   BAP_CLIENT_SECRET,
   BAP_URL,
@@ -466,7 +467,7 @@ const {
  */
 function setupConnection(req) {
   const bapConnection = new jsforce.Connection({
-    version: "62.0",
+    version: BAP_REST_API_VERSION,
     oauth2: {
       clientId: BAP_CLIENT_ID,
       clientSecret: BAP_CLIENT_SECRET,