From cebe1edd5e72f8ed1796758965f6db3d90b5a038 Mon Sep 17 00:00:00 2001 From: Anthony Rimet Date: Fri, 15 Sep 2023 11:29:05 +0200 Subject: [PATCH] Feat(tenant): Update socket function --- cypress/support/authentication.js | 2 +- src/api/index.js | 18 +++++++----------- src/api/services/mongoClient.js | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/cypress/support/authentication.js b/cypress/support/authentication.js index 188378c43..ca0c7c075 100644 --- a/cypress/support/authentication.js +++ b/cypress/support/authentication.js @@ -26,7 +26,7 @@ export const teardown = (withoutLogin = false) => { logout(); return; } - // set sessionStorage as tenant: 'lodex_test' + cy.window().then(win => { win.sessionStorage.setItem('tenant', 'lodex_test'); }); diff --git a/src/api/index.js b/src/api/index.js index 759cfd55d..ad560d8c9 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -135,18 +135,14 @@ if (!module.parent) { const io = new Server(httpServer); io.on('connection', socket => { - progress.addProgressListener(payload => { + const emitPayload = payload => { socket.emit(payload.room, payload.data); - }); - addPublisherListener(payload => { - socket.emit(payload.room, payload.data); - }); - addEnrichmentJobListener(payload => { - socket.emit(payload.room, payload.data); - }); - addImportListener(payload => { - socket.emit(payload.room, payload.data); - }); + }; + + progress.addProgressListener(emitPayload); + addPublisherListener(emitPayload); + addEnrichmentJobListener(emitPayload); + addImportListener(emitPayload); }); } diff --git a/src/api/services/mongoClient.js b/src/api/services/mongoClient.js index 199f33417..348bc3589 100644 --- a/src/api/services/mongoClient.js +++ b/src/api/services/mongoClient.js @@ -9,7 +9,7 @@ export const mongoConnectionString = tenant => export const mongoClientFactory = MongoClientImpl => async tenant => { if (!tenant) { throw new Error( - `Le tenant n'est pas renseigné, impossible de se connecter à la base de données.`, + `L'instance n'est pas renseigné, impossible de se connecter à la base de données.`, ); }