@ossy/workspaces 3.1.0 → 3.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "3.1.0",
+  "version": "3.4.0",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ossy/config": "^3.0.9",
-    "@ossy/schema": "^3.0.9"
+    "@ossy/schema": "^3.4.0"
   },
   "peerDependencies": {
     "@ossy/design-system": ">=1.0.0",
@@ -45,5 +45,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "9b146fb6fd9769f800863806c5bd16016508b218"
+  "gitHead": "d36b69444268d172bc3e8e1dc77e67afc63f8650"
 }

package/src/invite-user.task.js

@@ -5,13 +5,10 @@ import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
 import { EmailRenderer } from '@ossy/email'
 import { ConfigService } from '@ossy/config'
-import { createLogger } from '@ossy/observability'
 import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
 
 export const metadata = { id: '@ossy/workspaces/tasks/invite-user' }
 
-const log = createLogger('@ossy/workspaces/tasks/invite-user')
-
 const isEmailLike = maybeEmail => /.@.+\.../.test(maybeEmail)
 
 function createVerificationToken(workspaceId) {
@@ -72,13 +69,6 @@ export async function run({ payload, integrations, req }) {
   const emailClient = integrations?.get?.('email')
   if (emailClient) {
     await emailClient.send({ to: email, from: 'noreply@ossy.se', subject: workspaceInvitationSubject, html, text })
-  } else if (ConfigService.BuildEnvironment === 'local') {
-    log.info('-----------YOU GOT MAIL-----------')
-    log.info(`To: ${email}`)
-    log.info(`From: noreply@ossy.se`)
-    log.info(`Subject: ${workspaceInvitationSubject}`)
-    log.info(text || html)
-    log.info('----------------------------------')
   }
 
   return ''

package/src/server.js

@@ -1,3 +1,4 @@
 export { Workspace } from './workspace.aggregate.js'
 export { WorkspacesEvents } from './workspaces.events.js'
 export * from './workspaces.queries.js'
+export { WorkspaceSchema } from './schema-ids.js'

package/src/workspace.aggregate.spec.js

@@ -0,0 +1,280 @@
+import { describe, expect, it } from '@jest/globals'
+import { Workspace } from './workspace.aggregate.js'
+import { WorkspacesEvents } from './workspaces.events.js'
+import { WorkspaceSchema } from './schema-ids.js'
+
+const NOW = 1_700_000_000_000
+const DAY = 1000 * 60 * 60 * 24
+const WEEK = DAY * 7
+
+function createdEvent (overrides = {}) {
+  return {
+    ...WorkspacesEvents.Created({
+      resourceId: 'ws-1',
+      createdBy: 'user-1',
+      name: 'Acme',
+    }),
+    created: NOW,
+    ...overrides,
+  }
+}
+
+function withMeta (event, overrides = {}) {
+  return {
+    ...event,
+    created: NOW + 1000,
+    ...overrides,
+  }
+}
+
+describe('Workspace.View', () => {
+
+  describe('empty event list', () => {
+    it('returns savedState with normalized empty services when no events are given', () => {
+      expect(Workspace.View([], { id: 'ws-1', extra: 'data' })).toEqual({
+        id: 'ws-1',
+        extra: 'data',
+        services: {},
+      })
+    })
+
+    it('uses {} as the default savedState', () => {
+      expect(Workspace.View([])).toEqual({ services: {} })
+    })
+  })
+
+  describe('Created event', () => {
+    it('sets id from resourceId', () => {
+      expect(Workspace.View([createdEvent()]).id).toBe('ws-1')
+    })
+
+    it('sets type from the workspace schema', () => {
+      expect(Workspace.View([createdEvent()]).type).toBe(WorkspaceSchema.workspace)
+    })
+
+    it('sets name from payload', () => {
+      expect(Workspace.View([createdEvent()]).name).toBe('Acme')
+    })
+
+    it('sets createdBy and created from the event', () => {
+      const result = Workspace.View([createdEvent()])
+      expect(result.createdBy).toBe('user-1')
+      expect(result.created).toBe(NOW)
+    })
+
+    it('initializes users with the creator and empty collections', () => {
+      const result = Workspace.View([createdEvent()])
+      expect(result.users).toEqual(['user-1'])
+      expect(result.invitations).toEqual([])
+      expect(result.apiTokens).toEqual([])
+      expect(result.schemas).toEqual([])
+      expect(result.services).toEqual({})
+    })
+  })
+
+  describe('SchemasImported', () => {
+    it('replaces schemas from the payload', () => {
+      const schemas = [
+        { id: '@ossy/booking/schema/booking', label: 'Booking' },
+      ]
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.SchemasImported({
+          createdBy: 'user-1',
+          schemas,
+        })),
+      ])
+      expect(result.schemas).toEqual(schemas)
+    })
+
+    it('treats missing schemas as an empty list', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta({
+          event: 'SchemasImported',
+          createdBy: 'user-1',
+          payload: {},
+        }),
+      ])
+      expect(result.schemas).toEqual([])
+    })
+  })
+
+  describe('UserInvited', () => {
+    it('appends a pending invitation that has not expired', () => {
+      const expiresAt = Date.now() + DAY
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.UserInvited({
+          createdBy: 'user-1',
+          email: 'new@example.com',
+          expiresAt,
+        }), { created: NOW + 2000 }),
+      ])
+      expect(result.invitations).toEqual([{
+        email: 'new@example.com',
+        invitedAt: NOW + 2000,
+        expiresAt,
+        expired: false,
+      }])
+    })
+
+    it('keeps recently expired invitations marked as expired', () => {
+      const expiresAt = Date.now() - DAY
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.UserInvited({
+          createdBy: 'user-1',
+          email: 'late@example.com',
+          expiresAt,
+        }), { created: NOW + 2000 }),
+      ])
+      expect(result.invitations).toHaveLength(1)
+      expect(result.invitations[0]).toMatchObject({
+        email: 'late@example.com',
+        expired: true,
+      })
+    })
+
+    it('hides invitations expired more than one week ago', () => {
+      const expiresAt = Date.now() - WEEK - DAY
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.UserInvited({
+          createdBy: 'user-1',
+          email: 'gone@example.com',
+          expiresAt,
+        })),
+      ])
+      expect(result.invitations).toEqual([])
+    })
+  })
+
+  describe('UserInvitationAccepted', () => {
+    it('adds the accepting user and removes their invitation', () => {
+      const expiresAt = Date.now() + DAY
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.UserInvited({
+          createdBy: 'user-1',
+          email: 'new@example.com',
+          expiresAt,
+        })),
+        withMeta(WorkspacesEvents.UserInvitationAccepted({
+          createdBy: 'user-2',
+          email: 'new@example.com',
+        }), { created: NOW + 3000 }),
+      ])
+      expect(result.users).toEqual(['user-1', 'user-2'])
+      expect(result.invitations).toEqual([])
+    })
+  })
+
+  describe('ApiTokenCreated', () => {
+    it('appends a token using the event id and description', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.ApiTokenCreated({
+          createdBy: 'user-1',
+          description: 'CI token',
+          token: 'secret',
+        }), { id: 'token-1' }),
+      ])
+      expect(result.apiTokens).toEqual([
+        { id: 'token-1', description: 'CI token' },
+      ])
+    })
+  })
+
+  describe('ServiceEnabled and ServiceDisabled', () => {
+    it('enables a service under its npm package key', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.ServiceEnabled({
+          createdBy: 'user-1',
+          service: '@ossy/booking',
+        })),
+      ])
+      expect(result.services).toEqual({
+        '@ossy/booking': { enabled: true },
+      })
+    })
+
+    it('disables a previously enabled service', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.ServiceEnabled({
+          createdBy: 'user-1',
+          service: '@ossy/booking',
+        })),
+        withMeta(WorkspacesEvents.ServiceDisabled({
+          createdBy: 'user-1',
+          service: '@ossy/booking',
+        }), { created: NOW + 4000 }),
+      ])
+      expect(result.services).toEqual({
+        '@ossy/booking': { enabled: false },
+      })
+    })
+
+    it('drops non-scoped service keys via normalizeWorkspaceServices', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.ServiceEnabled({
+          createdBy: 'user-1',
+          service: 'booking',
+        })),
+      ])
+      expect(result.services).toEqual({})
+    })
+  })
+
+  describe('UserRemoved', () => {
+    it('removes the user from the workspace members list', () => {
+      const result = Workspace.View([
+        createdEvent(),
+        withMeta(WorkspacesEvents.UserInvitationAccepted({
+          createdBy: 'user-2',
+          email: 'new@example.com',
+        })),
+        withMeta(WorkspacesEvents.UserRemoved({
+          createdBy: 'user-1',
+          userId: 'user-2',
+        }), { created: NOW + 5000 }),
+      ])
+      expect(result.users).toEqual(['user-1'])
+    })
+  })
+
+  describe('unknown event type', () => {
+    it('ignores unknown events and returns state unchanged aside from services normalization', () => {
+      const unknown = { event: 'SomethingElse', payload: {} }
+      const result = Workspace.View([createdEvent(), unknown])
+      expect(result.name).toBe('Acme')
+      expect(result.users).toEqual(['user-1'])
+    })
+  })
+
+  describe('savedState merging', () => {
+    it('merges events on top of a provided savedState', () => {
+      const savedState = {
+        id: 'ws-1',
+        name: 'Acme',
+        users: ['user-1'],
+        invitations: [],
+        services: { '@ossy/booking': { enabled: true } },
+      }
+      const result = Workspace.View([
+        withMeta(WorkspacesEvents.UserRemoved({
+          createdBy: 'user-1',
+          userId: 'user-1',
+        })),
+      ], savedState)
+      expect(result.users).toEqual([])
+      expect(result.services).toEqual({
+        '@ossy/booking': { enabled: true },
+      })
+      expect(result.name).toBe('Acme')
+    })
+  })
+})