diff --git a/src/routes/api/login.js b/src/routes/api/login.js index e6866d836..7101f6c9b 100644 --- a/src/routes/api/login.js +++ b/src/routes/api/login.js @@ -65,7 +65,7 @@ async function loginToProtectedSession(req) { // this is set here so that event handlers have access to the protected session cls.namespace.set('protectedSessionId', protectedSessionId); - eventService.emit(eventService.ENTER_PROTECTED_SESSION); + await eventService.emit(eventService.ENTER_PROTECTED_SESSION); return { success: true, diff --git a/src/services/events.js b/src/services/events.js index e9e84e5a5..cffed6e41 100644 --- a/src/services/events.js +++ b/src/services/events.js @@ -9,18 +9,7 @@ function subscribe(eventType, listener) { eventListeners[eventType].push(listener); } -function emit(eventType, data) { - const listeners = eventListeners[eventType]; - - if (listeners) { - for (const listener of listeners) { - // not awaiting for async processing - listener(data); - } - } -} - -async function syncEmit(eventType, data) { +async function emit(eventType, data) { const listeners = eventListeners[eventType]; if (listeners) { @@ -33,7 +22,6 @@ async function syncEmit(eventType, data) { module.exports = { subscribe, emit, - syncEmit, // event types: NOTE_TITLE_CHANGED, ENTER_PROTECTED_SESSION, diff --git a/src/services/sync_table.js b/src/services/sync_table.js index aa85906a7..e2b6ef5b8 100644 --- a/src/services/sync_table.js +++ b/src/services/sync_table.js @@ -53,7 +53,7 @@ async function addEntitySync(entityName, entityId, sourceId) { sourceId: sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId() }); - await eventService.syncEmit(eventService.ENTITY_CHANGED, { + await eventService.emit(eventService.ENTITY_CHANGED, { entityName, entityId });