From e21ad16193269059f4c6f2e617ffa3fffe3e6724 Mon Sep 17 00:00:00 2001 From: Courtney Myers Date: Fri, 17 Jan 2025 15:09:18 -0500 Subject: [PATCH 1/3] Add env variable for BAP REST API version number, and use it in establishing the BAP connection --- app/server/.env.example | 1 + app/server/app/index.js | 1 + app/server/app/utilities/bap.js | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/server/.env.example b/app/server/.env.example index 1e025a36..5e36ba60 100644 --- a/app/server/.env.example +++ b/app/server/.env.example @@ -44,6 +44,7 @@ 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 index 4e941af3..df208ab2 100644 --- a/app/server/app/index.js +++ b/app/server/app/index.js @@ -62,6 +62,7 @@ const requiredEnvironmentVariables = [ "FORMIO_BASE_URL", "FORMIO_PROJECT_NAME", "FORMIO_API_KEY", + "BAP_REST_API_VERSION", "S3_PUBLIC_BUCKET", "S3_PUBLIC_REGION", ]; diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js index 6af72079..2aa95375 100644 --- 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, From 19ba72724506cb73f99cb924446395fa5e569681 Mon Sep 17 00:00:00 2001 From: Courtney Myers Date: Fri, 17 Jan 2025 15:10:29 -0500 Subject: [PATCH 2/3] Add BAP env variables to app's required env variables array, and remove not used FORMIO_DUPLICATES_API_KEY env variable from example .env file --- app/server/.env.example | 1 - app/server/app/index.js | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/server/.env.example b/app/server/.env.example index 5e36ba60..8ed5bd55 100644 --- a/app/server/.env.example +++ b/app/server/.env.example @@ -43,7 +43,6 @@ 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= diff --git a/app/server/app/index.js b/app/server/app/index.js index df208ab2..469ae6ea 100644 --- a/app/server/app/index.js +++ b/app/server/app/index.js @@ -63,6 +63,11 @@ const requiredEnvironmentVariables = [ "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", ]; From c06bfec43b41ce19326f8be74178d1a6dfd7866c Mon Sep 17 00:00:00 2001 From: Courtney Myers Date: Fri, 17 Jan 2025 15:14:46 -0500 Subject: [PATCH 3/3] Update GitHub Actions workflows to include BAP REST API version env --- .github/workflows/dev.yml | 2 ++ .github/workflows/staging.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 0a13122b..97cafcae 100644 --- 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 index 6b712ac2..22c4658c 100644 --- 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