From 61294626062e275304d733aedd81889afe928cca Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 26 Sep 2023 11:35:01 +0300 Subject: [PATCH] hotfix for documents logging --- actions/logsActions.js | 2 +- pages/api/deals/upload.js | 9 ++-- pages/api/file/download.js | 87 ++++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/actions/logsActions.js b/actions/logsActions.js index 896cd2d..0c88ab3 100644 --- a/actions/logsActions.js +++ b/actions/logsActions.js @@ -20,7 +20,7 @@ export const logDocumentAccess = (payload) => payload.lk_user_id = global.store.getState().user.email; payload.acc_number = global.store.getState().company.active; - axios.post(url, payload, { + axios.post(url, [ payload ], { withCredentials: true, }) .then((response) => diff --git a/pages/api/deals/upload.js b/pages/api/deals/upload.js index 34b586d..ce92da5 100644 --- a/pages/api/deals/upload.js +++ b/pages/api/deals/upload.js @@ -21,7 +21,6 @@ export default async function handler(req, res) { await cors(req, res); - console.log("Qqqqqqq", req); const { number, entity, id, filename } = req.query; return new Promise((resolve) => @@ -41,10 +40,8 @@ export default async function handler(req, res) documentTypeNumber: id, documentName: filename, }); - const path = `${ process.env.CRM_API_HOST }/lk/incident/RequestClient/UploadDocument?${ payload.toString() }`; - -// res.status(200).json({ path }); -// resolve(); + const path = `${ process.env.CRM_API_HOST }/lk/document?${ payload.toString() }`; + console.log({ path }); upload.single("file")(req, {}, err => { @@ -72,7 +69,7 @@ export default async function handler(req, res) .catch((error) => { console.error("-".repeat(30), "error.response.data:"); - console.error(error.response.data); + console.error(error.response); res.status(500).json(error.response.data); resolve(); diff --git a/pages/api/file/download.js b/pages/api/file/download.js index a56c9c5..54a231c 100644 --- a/pages/api/file/download.js +++ b/pages/api/file/download.js @@ -9,59 +9,62 @@ export default async function handler(req, res) { await cors(req, res); - if(req.headers.cookie !== undefined) + return new Promise(async (resolve) => { - const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : ""); - - if(cookies.jwt !== undefined && cookies.jwt !== null) + if(req.headers.cookie !== undefined) { - var client_jwt_decoded = jwt.verify(cookies.jwt, process.env.JWT_SECRET_CLIENT); - var crm_jwt = jwt.sign(client_jwt_decoded, process.env.JWT_SECRET_CRM, { noTimestamp: true }); + const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : ""); - try + if(cookies.jwt !== undefined && cookies.jwt !== null) { - axios.get(`${ process.env.CRM_API_HOST }/file/GetFile/`, { - params: { acc_number: client_jwt_decoded.acc_number, id: req.query.id }, - responseType: 'arraybuffer', - headers: { - "Authorization": `Bearer ${ crm_jwt }`, - } - }) - .then((crm_response) => - { - console.log("GET FILE crm_response"); - for(let i in crm_response) - { - if(i !== "data") - { - console.log(i); - console.log(crm_response[i]); - console.log(".".repeat(50)); - } - } - console.log("-".repeat(50)); + var client_jwt_decoded = jwt.verify(cookies.jwt, process.env.JWT_SECRET_CLIENT); + var crm_jwt = jwt.sign(client_jwt_decoded, process.env.JWT_SECRET_CRM, { noTimestamp: true }); - res.status(200).send(crm_response.data); - resolve(); - }) - .catch((error) => + try { - console.error(error); + axios.get(`${ process.env.CRM_API_HOST }/file/GetFile/`, { + params: { acc_number: client_jwt_decoded.acc_number, id: req.query.id }, + responseType: 'arraybuffer', + headers: { + "Authorization": `Bearer ${ crm_jwt }`, + } + }) + .then((crm_response) => + { + console.log("GET FILE crm_response"); + for(let i in crm_response) + { + if(i !== "data") + { + console.log(i); + console.log(crm_response[i]); + console.log(".".repeat(50)); + } + } + console.log("-".repeat(50)); + + res.status(200).send(crm_response.data); + resolve(); + }) + .catch((error) => + { + console.error(error); + res.status(500).send(); + resolve(); + }); + } + catch(e) + { + console.error(e); res.status(500).send(); resolve(); - }); + } } - catch(e) + else { - console.error(e); - res.status(500).send(); + res.status(403).send(); resolve(); } } - else - { - res.status(403).send(); - resolve(); - } - } + }); } \ No newline at end of file