From d3433a755d4e30c7d45b952b55831bde3e872f86 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Fri, 23 Sep 2022 11:42:10 +0200 Subject: [PATCH] revert --- src/onDeleteAccount.js | 107 +++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/src/onDeleteAccount.js b/src/onDeleteAccount.js index 5ee6787..b0233ee 100644 --- a/src/onDeleteAccount.js +++ b/src/onDeleteAccount.js @@ -16,65 +16,66 @@ const { isLocal, isAlpha } = require('./helpers/env') // const ACCOUNT_ID = isLocal() ? 'default_account_id' : 'enedis-sge-grandlyon' async function onDeleteAccount() { - if (!isAlpha()) { - 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) - // Parse local info for deletion test - if (isLocal()) { - log('warn', 'Local run') - const fields = JSON.parse( - process.env.COZY_FIELDS ? process.env.COZY_FIELDS : '{}' - ) - process.env.COZY_FIELDS = JSON.stringify({ - ...fields, - ...accountData.auth, - }) - } - const secrets = getAccountSecret() - const userConsent = await getBoConsent( - secrets.boBaseUrl, - secrets.boToken, - accountData.data.consentId + 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) + // Parse local info for deletion test + if (isLocal()) { + log('warn', 'Local run') + const fields = JSON.parse( + process.env.COZY_FIELDS ? process.env.COZY_FIELDS : '{}' ) + process.env.COZY_FIELDS = JSON.stringify({ + ...fields, + ...accountData.auth, + }) + } + const secrets = getAccountSecret() + const userConsent = await getBoConsent( + secrets.boBaseUrl, + secrets.boToken, + accountData.data.consentId + ) - if (userConsent.ID && userConsent.pointID) { - log('log', `Consent ${userConsent.ID} found for user`) - if (userConsent.serviceID) { - await deleteBoConsent( - secrets.boBaseUrl, - secrets.boToken, - userConsent.ID + 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) { + await deleteBoConsent( + secrets.boBaseUrl, + 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 ) - // 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 - ) - } - } else { - log('error', `No service id retrieved from BO`) - throw errors.VENDOR_DOWN } + } else { + log('error', `No service id retrieved from BO`) + throw errors.VENDOR_DOWN } - - log('info', 'Deleting account succeed') - } else { - log( - 'error', - 'No account revision was found, something went wrong during the deletion of said account' - ) - throw errors.VENDOR_DOWN } + + log('info', 'Deleting account succeed') + } else { + log( + 'error', + 'No account revision was found, something went wrong during the deletion of said account' + ) + throw errors.VENDOR_DOWN } } -- GitLab