diff --git a/index.js b/index.js index 4fcb8283175a990b5ce056afe739c6a32eaed9c3..21ef1498af85853d7d31feb29f20e17dcba0171c 100644 --- a/index.js +++ b/index.js @@ -173,7 +173,7 @@ async function start(fields, cozyParameters) { await saveAccountData(this.accountId, { ...accountData.data, consentId: consent.ID, - expirationDate: contractEndDate, + inseeCode: user.inseeCode, }) } else { log('info', 'Alternate start...') @@ -188,7 +188,8 @@ async function start(fields, cozyParameters) { baseUrl, apiAuthKey, sgeLogin, - true + true, + accountData.data.inseeCode ) if (!userConsent) { @@ -228422,9 +228423,14 @@ async function verifyUserIdentity( baseUrl, apiAuthKey, loginUtilisateur, - isAlternateStart = false + isAlternateStart = false, + inseeCode = '' ) { - const inseeCode = await getInseeCode(fields.postalCode, fields.city) + // If first start get InseeCode + log('debug', 'verifyUserIdentity') + if (!isAlternateStart) { + inseeCode = await getInseeCode(fields.postalCode, fields.city) + } const pdl = await findUserPdl( `${baseUrl}/enedis_SDE_recherche-point/1.0`, @@ -228478,6 +228484,7 @@ async function getInseeCode(postalCode, city) { try { log('info', `Query getInseeCode for postalCode ${postalCode} / ${city}`) const response = await axios.get(`${API_URL}/${postalCode}`) + console.log('pouet') if (response.data.length === 1) { return response.data[0].codeCommune @@ -228523,6 +228530,11 @@ async function saveAccountData(accountId, accountData) { return account } +/** + * Return account + * @param {string} accountId + * @returns {Account} + */ async function getAccount(accountId) { log('info', `getAccount: ${accountId}`) const accounts = await cozyClient.data.findAll('io.cozy.accounts') @@ -228531,18 +228543,7 @@ async function getAccount(accountId) { )[0] } -async function getAccountForDelete(accountId, accountRev) { - log('info', `getAccountForDelete: ${accountId} ${accountRev}`) - const body = await cozyClient.fetchJSON( - 'GET', - `/data/io.cozy.accounts/${accountId}?rev=${accountRev}` - ) - - log('debug', `getAccountForDelete: ${body}`) - return body -} - -module.exports = { getAccount, saveAccountData, getAccountForDelete } +module.exports = { getAccount, saveAccountData } /***/ }), @@ -228557,15 +228558,7 @@ function isLocal() { ) } -/** - * Verify if it's an alpha URL - * @returns {boolean} - */ -function isAlpha() { - return process.env.COZY_URL.includes('alpha') -} - -module.exports = { isLocal, isAlpha } +module.exports = { isLocal } /***/ }) diff --git a/onDeleteAccount.js b/onDeleteAccount.js index b77b00bbea71cd07789f5cf043650de4e19af7b7..db90e7610e6a209669de5147a0d37efec0afed43 100644 --- a/onDeleteAccount.js +++ b/onDeleteAccount.js @@ -227423,6 +227423,11 @@ async function saveAccountData(accountId, accountData) { return account } +/** + * Return account + * @param {string} accountId + * @returns {Account} + */ async function getAccount(accountId) { log('info', `getAccount: ${accountId}`) const accounts = await cozyClient.data.findAll('io.cozy.accounts') @@ -227431,18 +227436,7 @@ async function getAccount(accountId) { )[0] } -async function getAccountForDelete(accountId, accountRev) { - log('info', `getAccountForDelete: ${accountId} ${accountRev}`) - const body = await cozyClient.fetchJSON( - 'GET', - `/data/io.cozy.accounts/${accountId}?rev=${accountRev}` - ) - - log('debug', `getAccountForDelete: ${body}`) - return body -} - -module.exports = { getAccount, saveAccountData, getAccountForDelete } +module.exports = { getAccount, saveAccountData } /***/ }), @@ -227457,15 +227451,7 @@ function isLocal() { ) } -/** - * Verify if it's an alpha URL - * @returns {boolean} - */ -function isAlpha() { - return process.env.COZY_URL.includes('alpha') -} - -module.exports = { isLocal, isAlpha } +module.exports = { isLocal } /***/ }), @@ -227474,33 +227460,28 @@ module.exports = { isLocal, isAlpha } // @ts-check const { log, errors } = __webpack_require__(1) -const { - getAccountRev, - getAccountSecret, - getAccountId, -} = __webpack_require__(1607) +const { getAccountRev, getAccountSecret } = __webpack_require__(1607) const { getBoConsent, deleteBoConsent } = __webpack_require__(1557) const { terminateContract } = __webpack_require__(1598) -const { getAccountForDelete } = __webpack_require__(1604) +const { getAccount } = __webpack_require__(1604) const moment = __webpack_require__(1373) __webpack_require__(1510) moment.locale('fr') // set the language moment.tz.setDefault('Europe/Paris') // set the timezone -const { isLocal, isAlpha } = __webpack_require__(1605) -// const ACCOUNT_ID = isLocal() ? 'default_account_id' : 'enedis-sge-grandlyon' +const { isLocal } = __webpack_require__(1605) +const ACCOUNT_ID = isLocal() ? 'default_account_id' : 'enedis-sge-grandlyon' async function onDeleteAccount() { log('info', 'Deleting account ...') log('info', 'Getting secrets ...') - const ACCOUNT_ID = getAccountId() + const accountRev = getAccountRev() if (accountRev) { log('info', 'Account rev exist') - const accountData = await getAccountForDelete(ACCOUNT_ID, accountRev) + const accountData = await getAccount(ACCOUNT_ID) // Parse local info for deletion test if (isLocal()) { - log('warn', 'Local run') const fields = JSON.parse( process.env.COZY_FIELDS ? process.env.COZY_FIELDS : '{}' ) @@ -227516,8 +227497,6 @@ async function onDeleteAccount() { accountData.data.consentId ) - log('info', `isAlpha: ${isAlpha()}`) - log('info', `userConsent: ${JSON.stringify(userConsent)}`) if (userConsent.ID && userConsent.pointID) { log('log', `Consent ${userConsent.ID} found for user`) if (userConsent.serviceID) { @@ -227526,17 +227505,14 @@ async function onDeleteAccount() { secrets.boToken, userConsent.ID ) - // Verify if it's dev env to prevent delete of real data - if (!isAlpha()) { - await terminateContract( - secrets.wso2BaseUrl, - secrets.apiToken, - secrets.sgeLogin, - secrets.contractId, - userConsent.pointID, - userConsent.serviceID - ) - } + await terminateContract( + secrets.wso2BaseUrl, + secrets.apiToken, + secrets.sgeLogin, + secrets.contractId, + userConsent.pointID, + userConsent.serviceID + ) } else { log('error', `No service id retrieved from BO`) throw errors.VENDOR_DOWN @@ -227587,7 +227563,6 @@ function getAccountId() { function getAccountRev() { log('info', `getAccountRev`) - log('info', `getAccountRev: ${JSON.stringify(process.env.COZY_FIELDS)}`) try { return isLocal() ? 'fakeAccountRev' @@ -227603,7 +227578,6 @@ function getAccountRev() { * @returns {Fields} */ function getAccountSecret() { - log('info', `getAccountSecret`) try { return isLocal() ? JSON.parse(process.env.COZY_FIELDS)