From ea191e589e4642568a350264dcdf0ab05109e518 Mon Sep 17 00:00:00 2001 From: Tarcisio Ferraz Date: Mon, 17 Feb 2025 20:00:10 -0300 Subject: [PATCH 1/4] check if is electron app --- workers/loc.api/generate-report-file/index.js | 7 +++++++ workers/loc.api/queue/helpers/utils.js | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/workers/loc.api/generate-report-file/index.js b/workers/loc.api/generate-report-file/index.js index df1a8d6e..00b64129 100644 --- a/workers/loc.api/generate-report-file/index.js +++ b/workers/loc.api/generate-report-file/index.js @@ -12,6 +12,7 @@ const { const getLocalReportFolderPaths = require( '../queue/helpers/get-local-report-folder-paths' ) +const { isElectronjsEnv } = require('../queue/helpers/utils') const _getReportFileStoreStatus = async ({ hasGrcService, @@ -38,6 +39,12 @@ const _getReportFileStoreStatus = async ({ ? `${conf?.remoteReportUrn}?token=${token}` : null + if (!isElectronjsEnv) { + return { + isSaveLocaly: false + } + } + return { isSaveLocaly: true, localReportFolderPath, diff --git a/workers/loc.api/queue/helpers/utils.js b/workers/loc.api/queue/helpers/utils.js index 9c743e02..477b08f1 100644 --- a/workers/loc.api/queue/helpers/utils.js +++ b/workers/loc.api/queue/helpers/utils.js @@ -174,5 +174,6 @@ const writableToPromise = stream => { module.exports = { moveFileToLocalStorage, writableToPromise, - createUniqueFileName + createUniqueFileName, + isElectronjsEnv } From 4305abeeca7c60de9835e9b2809f585535cdd794 Mon Sep 17 00:00:00 2001 From: Tarcisio Ferraz Date: Thu, 6 Mar 2025 18:42:03 -0300 Subject: [PATCH 2/4] check if is hosted --- config/service.report.json.example | 3 ++- workers/loc.api/generate-report-file/index.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/service.report.json.example b/config/service.report.json.example index c7e88141..5c28a47c 100644 --- a/config/service.report.json.example +++ b/config/service.report.json.example @@ -15,5 +15,6 @@ "isSpamRestrictionMode": true, "isAddedUniqueEndingToReportFileName": false, "isCompress": true, - "isLoggerDisabled": false + "isLoggerDisabled": false, + "isHosted": false } diff --git a/workers/loc.api/generate-report-file/index.js b/workers/loc.api/generate-report-file/index.js index 00b64129..e61532aa 100644 --- a/workers/loc.api/generate-report-file/index.js +++ b/workers/loc.api/generate-report-file/index.js @@ -27,6 +27,10 @@ const _getReportFileStoreStatus = async ({ !email || typeof email !== 'string' ) { + if (conf.isHosted) { + throw new EmailSendingError() + } + const { localReportFolderPath } = getLocalReportFolderPaths(rootPath) From 85ff5a674a45870ea1bcb13b4aa5623c3603ea1b Mon Sep 17 00:00:00 2001 From: Tarcisio Ferraz Date: Fri, 7 Mar 2025 16:32:44 -0300 Subject: [PATCH 3/4] requested changes --- config/service.report.json.example | 2 +- workers/loc.api/generate-report-file/index.js | 6 ------ workers/loc.api/queue/helpers/utils.js | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/config/service.report.json.example b/config/service.report.json.example index 5c28a47c..4f497869 100644 --- a/config/service.report.json.example +++ b/config/service.report.json.example @@ -16,5 +16,5 @@ "isAddedUniqueEndingToReportFileName": false, "isCompress": true, "isLoggerDisabled": false, - "isHosted": false + "isHosted": true } diff --git a/workers/loc.api/generate-report-file/index.js b/workers/loc.api/generate-report-file/index.js index e61532aa..d89c7c32 100644 --- a/workers/loc.api/generate-report-file/index.js +++ b/workers/loc.api/generate-report-file/index.js @@ -43,12 +43,6 @@ const _getReportFileStoreStatus = async ({ ? `${conf?.remoteReportUrn}?token=${token}` : null - if (!isElectronjsEnv) { - return { - isSaveLocaly: false - } - } - return { isSaveLocaly: true, localReportFolderPath, diff --git a/workers/loc.api/queue/helpers/utils.js b/workers/loc.api/queue/helpers/utils.js index 477b08f1..9c743e02 100644 --- a/workers/loc.api/queue/helpers/utils.js +++ b/workers/loc.api/queue/helpers/utils.js @@ -174,6 +174,5 @@ const writableToPromise = stream => { module.exports = { moveFileToLocalStorage, writableToPromise, - createUniqueFileName, - isElectronjsEnv + createUniqueFileName } From 28f5a31ac6c6d0e5316c3fbff9390454db133881 Mon Sep 17 00:00:00 2001 From: Tarcisio Ferraz Date: Fri, 7 Mar 2025 16:33:23 -0300 Subject: [PATCH 4/4] clean up --- workers/loc.api/generate-report-file/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/workers/loc.api/generate-report-file/index.js b/workers/loc.api/generate-report-file/index.js index d89c7c32..a6f11819 100644 --- a/workers/loc.api/generate-report-file/index.js +++ b/workers/loc.api/generate-report-file/index.js @@ -12,7 +12,6 @@ const { const getLocalReportFolderPaths = require( '../queue/helpers/get-local-report-folder-paths' ) -const { isElectronjsEnv } = require('../queue/helpers/utils') const _getReportFileStoreStatus = async ({ hasGrcService,