diff --git a/src/index.js b/src/index.js index 170c5bccd0acd9e68554ab6169b270a259b0df52..022bc24469651080453f717824835fd80bfd104f 100644 --- a/src/index.js +++ b/src/index.js @@ -65,18 +65,19 @@ module.exports = { getContractStartDate } */ async function start(fields, cozyParameters) { log('info', 'Gathering data ...') - let pointId = fields.pointId + const pointId = fields.pointId let baseUrl = fields.wso2BaseUrl let apiAuthKey = fields.apiToken + let contractId = fields.contractId //TODO switch variable to english let sgeLogin = fields.sgeLogin log('info', 'Authenticating ...') //TODO: Verify if condition is working in local and on build version if (cozyParameters && Object.keys(cozyParameters).length !== 0) { log('debug', 'Found COZY_PARAMETERS') - pointId = cozyParameters.secret.pointId baseUrl = cozyParameters.secret.wso2BaseUrl apiAuthKey = cozyParameters.secret.apiToken + contractId = cozyParameters.secret.contractId sgeLogin = cozyParameters.secret.sgeLogin } @@ -96,6 +97,7 @@ async function start(fields, cozyParameters) { let consent = await createBoConsent( pointId, user.lastname, + user.firstname, user.address, user.postalCode, user.inseeCode @@ -112,7 +114,7 @@ async function start(fields, cozyParameters) { baseUrl, apiAuthKey, sgeLogin, - fields.contractId, + contractId, user.pointId ) if (!serviceId) { @@ -120,7 +122,7 @@ async function start(fields, cozyParameters) { baseUrl, apiAuthKey, sgeLogin, - fields.contractId, + contractId, user.lastname, user.pointId, contractStartDate, @@ -130,10 +132,6 @@ async function start(fields, cozyParameters) { consent = await updateBoConsent(consent, serviceId) // Save bo id into account const accountData = await getAccount(ACCOUNT_ID) - console.log( - '🚀 ~ file: index.js ~ line 132 ~ start ~ accountData', - accountData - ) await saveAccountData(this.accountId, { ...accountData.data, @@ -144,7 +142,7 @@ async function start(fields, cozyParameters) { const accountData = await getAccount(ACCOUNT_ID) const userConsent = await getBoConsent(accountData.data.consentId) const user = await verifyUserIdentity(fields, baseUrl, apiAuthKey, sgeLogin) - console.log(user) + if (user.lastname !== userConsent.lastname || !user) { log('error', `Invalid or not found consent for user`) await deleteBoConsent() @@ -153,7 +151,7 @@ async function start(fields, cozyParameters) { baseUrl, apiAuthKey, sgeLogin, - fields.contractId, + contractId, fields.pointId, userConsent.serviceId ) @@ -493,7 +491,6 @@ async function agregateMonthAndYearData(data) { * @returns {boolean} */ function isFirstStart(account) { - console.log(account) if (account && account.data && account.data.consentId) { log('info', 'Konnector not first start') return false diff --git a/src/requests/bo.js b/src/requests/bo.js index e3710e2785ee4d9484d1647b65832e1fd81be541..f60cb49fc23355f2f2760896ea056dab929857bd 100644 --- a/src/requests/bo.js +++ b/src/requests/bo.js @@ -9,13 +9,21 @@ const { log, errors } = require('cozy-konnector-libs') * @param {string} inseeCode * @returns {Consent} */ -function createBoConsent(pointId, name, address, postalCode, inseeCode) { +function createBoConsent( + pointId, + lastname, + firstname, + address, + postalCode, + inseeCode +) { //TODO: Implement log('info', `Query createBoConsent`) return { id: 1, pointId, - name, + lastname, + firstname, address, postalCode, inseeCode,