From ef527568cd2ae441419a244d7d083fd6ce26f26a Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Thu, 22 Sep 2022 17:47:00 +0200 Subject: [PATCH] fix --- src/onDeleteAccount.js | 4 ++-- src/requests/cozy.js | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/onDeleteAccount.js b/src/onDeleteAccount.js index 764758b..7fca9a8 100644 --- a/src/onDeleteAccount.js +++ b/src/onDeleteAccount.js @@ -3,7 +3,7 @@ const { log, errors } = require('cozy-konnector-libs') const { getAccountRev, getAccountSecret } = require('./helpers/account') const { getBoConsent, deleteBoConsent } = require('./requests/bo') const { terminateContract } = require('./core/contractTermination') -const { getAccount } = require('./requests/cozy') +const { getAccountForDelete } = require('./requests/cozy') const moment = require('moment') require('moment-timezone') moment.locale('fr') // set the language @@ -19,7 +19,7 @@ async function onDeleteAccount() { if (accountRev) { log('info', 'Account rev exist') - const accountData = await getAccount(ACCOUNT_ID, accountRev) + const accountData = await getAccountForDelete(ACCOUNT_ID, accountRev) // Parse local info for deletion test if (isLocal()) { log('warn', 'Local run') diff --git a/src/requests/cozy.js b/src/requests/cozy.js index 99b25b7..62413fe 100644 --- a/src/requests/cozy.js +++ b/src/requests/cozy.js @@ -14,7 +14,15 @@ async function saveAccountData(accountId, accountData) { return account } -async function getAccount(accountId, accountRev) { +async function getAccount(accountId) { + log('info', `getAccount: ${accountId}`) + const accounts = await cozyClient.data.findAll('io.cozy.accounts') + return accounts.filter(account => + isLocal() ? account._id === accountId : account.account_type === accountId + )[0] +} + +async function getAccountForDelete(accountId, accountRev) { log('info', `getAccount: ${accountId}`) const accounts = await cozyClient.data.findAll('io.cozy.accounts') const body = await cozyClient.fetchJSON( @@ -28,4 +36,4 @@ async function getAccount(accountId, accountRev) { )[0] } -module.exports = { getAccount, saveAccountData } +module.exports = { getAccount, saveAccountData, getAccountForDelete } -- GitLab