From ddaba5eab429386085ecf01a56d9b55816312d69 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Fri, 23 Sep 2022 10:20:40 +0200 Subject: [PATCH] publish: fix generated from commit 96f59f39bafedbb589c91a62826b5ac6136bc249 --- index.js | 20 ++++++++++---------- onDeleteAccount.js | 31 ++++++++++++++----------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/index.js b/index.js index 5f652a0..24e6273 100644 --- a/index.js +++ b/index.js @@ -228532,20 +228532,12 @@ async function getAccount(accountId) { async function getAccountForDelete(accountId, accountRev) { log('info', `getAccountForDelete: ${accountId} ${accountRev}`) - // const body = await cozyClient.data.find( - // `io.cozy.accounts/${accountId}?rev=${accountRev}` - // ) - // const body = await cozyClient.data.findAll( - // `io.cozy.accounts/${accountId}?rev=${accountRev}` - // ) - // console.log('🚀 ~ file: cozy.js ~ line 31 ~ getAccountForDelete ~ body', body) const body = await cozyClient.fetchJSON( 'GET', `/data/io.cozy.accounts/${accountId}?rev=${accountRev}` ) - console.log('🚀 ~ file: cozy.js ~ line 38 ~ getAccountForDelete ~ body', body) - log('info', `getAccountForDelete: ${body}`) + log('debug', `getAccountForDelete: ${body}`) return body } @@ -228564,7 +228556,15 @@ function isLocal() { ) } -module.exports = { isLocal } +/** + * Verify if it's an alpha URL + * @returns {boolean} + */ +function isAlpha() { + return process.env.COZY_URL.includes('alpha') +} + +module.exports = { isLocal, isAlpha } /***/ }) diff --git a/onDeleteAccount.js b/onDeleteAccount.js index 4012f2b..b3264b7 100644 --- a/onDeleteAccount.js +++ b/onDeleteAccount.js @@ -227433,20 +227433,12 @@ async function getAccount(accountId) { async function getAccountForDelete(accountId, accountRev) { log('info', `getAccountForDelete: ${accountId} ${accountRev}`) - // const body = await cozyClient.data.find( - // `io.cozy.accounts/${accountId}?rev=${accountRev}` - // ) - // const body = await cozyClient.data.findAll( - // `io.cozy.accounts/${accountId}?rev=${accountRev}` - // ) - // console.log('🚀 ~ file: cozy.js ~ line 31 ~ getAccountForDelete ~ body', body) const body = await cozyClient.fetchJSON( 'GET', `/data/io.cozy.accounts/${accountId}?rev=${accountRev}` ) - console.log('🚀 ~ file: cozy.js ~ line 38 ~ getAccountForDelete ~ body', body) - log('info', `getAccountForDelete: ${body}`) + log('debug', `getAccountForDelete: ${body}`) return body } @@ -227465,7 +227457,15 @@ function isLocal() { ) } -module.exports = { isLocal } +/** + * Verify if it's an alpha URL + * @returns {boolean} + */ +function isAlpha() { + return process.env.COZY_URL.includes('alpha') +} + +module.exports = { isLocal, isAlpha } /***/ }), @@ -227486,16 +227486,12 @@ const moment = __webpack_require__(1373) __webpack_require__(1510) moment.locale('fr') // set the language moment.tz.setDefault('Europe/Paris') // set the timezone -const { isLocal } = __webpack_require__(1605) +const { isLocal, isAlpha } = __webpack_require__(1605) // const ACCOUNT_ID = isLocal() ? 'default_account_id' : 'enedis-sge-grandlyon' async function onDeleteAccount() { log('info', 'Deleting account ...') log('info', 'Getting secrets ...') - log('info', JSON.stringify(process.env.COZY_FIELDS)) - log('info', JSON.stringify(process.env.COZY_URL)) - log('info', JSON.stringify(process.env.COZY_PARAMETERS)) - const ACCOUNT_ID = getAccountId() const accountRev = getAccountRev() @@ -227516,7 +227512,6 @@ async function onDeleteAccount() { const secrets = getAccountSecret() log('info', 'AFTER') log('info', accountData) - log('info', `data: ${JSON.stringify(accountData)}`) const userConsent = await getBoConsent( secrets.boBaseUrl, secrets.boToken, @@ -227525,7 +227520,9 @@ async function onDeleteAccount() { if (userConsent.ID && userConsent.pointID) { log('log', `Consent ${userConsent.ID} found for user`) - if (userConsent.serviceID) { + // Verify if it's dev env to prevent delete of real data + log('info', isAlpha()) + if (userConsent.serviceID && !isAlpha()) { await deleteBoConsent( secrets.boBaseUrl, secrets.boToken, -- GitLab