Skip to content

Commit

Permalink
Merge pull request #523 from USEPA/develop
Browse files Browse the repository at this point in the history
Sync staging with develop
  • Loading branch information
courtneymyers authored Jan 6, 2025
2 parents 5f8ae83 + 9ae4674 commit 9c67e2c
Show file tree
Hide file tree
Showing 3 changed files with 423 additions and 57 deletions.
24 changes: 12 additions & 12 deletions app/server/app/routes/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,18 @@ router.get("/formio/2024/frf", (req, res) => {
});
});

// router.get("/formio/2024/prf", (req, res) => {
// axiosFormio(req)
// .get(formUrl["2024"].prf)
// .then((axiosRes) => axiosRes.data)
// .then((schema) => {
// return res.json({ status: verifySchema(schema) });
// })
// .catch((_error) => {
// // NOTE: error is logged in axiosFormio response interceptor
// return res.json({ status: false });
// });
// });
router.get("/formio/2024/prf", (req, res) => {
axiosFormio(req)
.get(formUrl["2024"].prf)
.then((axiosRes) => axiosRes.data)
.then((schema) => {
return res.json({ status: verifySchema(schema) });
})
.catch((_error) => {
// NOTE: error is logged in axiosFormio response interceptor
return res.json({ status: false });
});
});

// router.get("/formio/2024/crf", (req, res) => {
// axiosFormio(req)
Expand Down
6 changes: 5 additions & 1 deletion app/server/app/utilities/bap.js
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,8 @@ async function queryForBapFormSubmissionData(
.limit(1)
.execute(async (err, records) => ((await err) ? err : records));

if (formRecordTypeIdQuery.length === 0) return null;

const formRecordTypeId = formRecordTypeIdQuery["0"].Id;

// `SELECT
Expand Down Expand Up @@ -1909,7 +1911,9 @@ function verifyBapConnection(req, { name, args }) {
function callback() {
return name(...args).catch((err) => {
const logMessage = `BAP Error: ${err}.`;
log({ level: "error", message: logMessage, req });
log({ level: "error", message: logMessage, req, otherInfo: err });

// Error: Unable to refresh session due to: No refresh token found in the connection.

throw err;
});
Expand Down
Loading

0 comments on commit 9c67e2c

Please sign in to comment.