From 1d05a12913ffe8eb74035268d75b4d17f1830644 Mon Sep 17 00:00:00 2001 From: Bastien Dumont <bdumont@grandlyon.com> Date: Thu, 11 Apr 2024 15:17:42 +0200 Subject: [PATCH] fix: boUrlGRDF --- src/core/core.js | 12 ++++++------ src/index.js | 4 ++-- src/requests/bo.js | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/core.js b/src/core/core.js index 8c4e97e..6ffd62f 100644 --- a/src/core/core.js +++ b/src/core/core.js @@ -15,11 +15,11 @@ const manualExecution = process.env.COZY_JOB_MANUAL_EXECUTION === 'true' /** * @param {GRDFConsent[]} consents - * @param {string} boBaseUrl + * @param {string} boUrlGRDF * @param {string} boToken * @returns {Promise<boolean>} Returns true if consent needs to be created. Returns false if consent is valid */ -async function handleConsents(consents, boBaseUrl, boToken) { +async function handleConsents(consents, boUrlGRDF, boToken) { if (consents.some(consent => consent.etat_droit_acces === 'Active')) { log('info', 'Found consent "Active"') return false @@ -51,7 +51,7 @@ async function handleConsents(consents, boBaseUrl, boToken) { const accountData = await getAccount(ACCOUNT_ID) if (accountData?.data?.consentId) { await deleteBoConsent({ - boBaseUrl, + boUrlGRDF, boToken, consentId: accountData.data.consentId }) @@ -83,14 +83,14 @@ async function createConsent({ startDate, endDate, boToken, - boBaseUrl + boUrlGRDF }) { const startDateString = moment(startDate).format('YYYY-MM-DD') const endDateConsent = moment(endDate).add(1, 'year') const endDateString = endDateConsent.format('YYYY-MM-DD') const { ID: consentId } = await createBoConsent({ - boBaseUrl, + boUrlGRDF, boToken, pce, firstname, @@ -119,7 +119,7 @@ async function createConsent({ endDate: endDateString }).catch(async err => { await deleteBoConsent({ - boBaseUrl, + boUrlGRDF, boToken, consentId: consentId }) diff --git a/src/index.js b/src/index.js index e52f5f4..2e7bc34 100755 --- a/src/index.js +++ b/src/index.js @@ -86,7 +86,7 @@ async function start(fields, cozyParameters) { try { const { access_token } = await getAuthToken(grdfId, grdfSecret) const consents = await getConsents(access_token, pce) - const noValidConsent = await handleConsents(consents, boBaseUrl, boToken) + const noValidConsent = await handleConsents(consents, boUrlGRDF, boToken) if (NO_DATA) { log('debug', `Stopping konnector before creating consents`) @@ -104,7 +104,7 @@ async function start(fields, cozyParameters) { postalCode, startDate, endDate, - boBaseUrl: boUrlGRDF, + boUrlGRDF, boToken }) } diff --git a/src/requests/bo.js b/src/requests/bo.js index 1b166b2..5875430 100644 --- a/src/requests/bo.js +++ b/src/requests/bo.js @@ -14,7 +14,7 @@ const Sentry = require('@sentry/node') * endDate: moment.Moment}} args */ async function createBoConsent({ - boBaseUrl, + boUrlGRDF, boToken, pce, lastname, @@ -31,7 +31,7 @@ async function createBoConsent({ try { const { data } = await axios.post( - `${boBaseUrl}/consent`, + `${boUrlGRDF}/consent`, { lastname, firstname, @@ -59,11 +59,11 @@ async function createBoConsent({ /** * @param {Object} args description - * @param {string} args.boBaseUrl url + * @param {string} args.boUrlGRDF url * @param {string} args.boToken bo token * @param {string} args.consentId ID from back office */ -async function deleteBoConsent({ boBaseUrl, boToken, consentId }) { +async function deleteBoConsent({ boUrlGRDF, boToken, consentId }) { log('info', `Query deleteBoConsent ${consentId}`) const headers = { headers: { @@ -72,7 +72,7 @@ async function deleteBoConsent({ boBaseUrl, boToken, consentId }) { } try { const { data } = await axios.delete( - `${boBaseUrl}/consent/${consentId}`, + `${boUrlGRDF}/consent/${consentId}`, headers ) return data -- GitLab