@data-fair/lib-node 2.6.0 → 2.7.0

package/events-queue.js

@@ -70,16 +70,26 @@ export class EventsQueue {
     if (this.stopped) { throw new Error('events queue has been stopped') }
     event.date = new Date().toISOString()
     debug('pushEvent', event)
-    if (sessionState && sessionState.user) {
-      event.originator = {
-        user: { id: sessionState.user.id, name: sessionState.user.name }
-      }
-      if (sessionState.organization) {
-        event.originator.organization = {
-          id: sessionState.organization.id,
-          name: sessionState.organization.name,
-          department: sessionState.organization.department,
-          departmentName: sessionState.organization.departmentName
+    if (!event.originator && sessionState?.user && sessionState.account) {
+      if (sessionState.user.asAdmin) {
+        event.originator = {
+          user: { ...sessionState.user.asAdmin, admin: true }
+        }
+      } else if (sessionState.user.adminMode && (sessionState.account.type !== event.sender?.type || sessionState.account.id !== event.sender?.id)) {
+        event.originator = {
+          user: { id: sessionState.user.id, name: sessionState.user.name, admin: true }
+        }
+      } else {
+        event.originator = {
+          user: { id: sessionState.user.id, name: sessionState.user.name }
+        }
+        if (sessionState.organization) {
+          event.originator.organization = {
+            id: sessionState.organization.id,
+            name: sessionState.organization.name,
+            department: sessionState.organization.department,
+            departmentName: sessionState.organization.departmentName
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [
@@ -14,7 +14,7 @@
     "build": "cd .. && npm run build"
   },
   "dependencies": {
-    "@data-fair/lib-common-types": "^1.5.0",
+    "@data-fair/lib-common-types": "^1.8.4",
     "@data-fair/lib-validation": "^1.0.0",
     "@data-fair/lib-utils": "^1.1.0",
     "agentkeepalive": "^4.5.0",