@ossy/users 3.2.0 → 3.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/users",
   "description": "User domain - aggregate, events, and validators for the Ossy user model",
-  "version": "3.2.0",
+  "version": "3.5.0",
   "private": false,
   "type": "module",
   "main": "./src/index.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@ossy/config": "^3.0.9",
     "@ossy/observability": "^3.0.9",
-    "@ossy/schema": "^3.0.9",
+    "@ossy/schema": "^3.5.0",
     "nanoid": "^5.1.11"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "b045f1fd7f2fe00c776b9ea96f76083b93fd8556"
+  "gitHead": "23167600f991596f122765a53f2b9df08314e115"
 }

package/src/request-email-change.task.js

@@ -6,6 +6,7 @@ import { EmailRenderer } from '@ossy/email'
 import { ConfigService } from '@ossy/config'
 import { createTranslatorForBuild } from '@ossy/platform/locale'
 import { createLogger } from '@ossy/observability'
+import { isEmailLike } from '@ossy/schema'
 import { createEmailChangeToken, EMAIL_CHANGE_TOKEN_TYPE } from './email-change-token.js'
 import VerifyEmailChangeEmail, {
   id as verifyEmailChangeEmailId,
@@ -15,8 +16,6 @@ export const metadata = { id: '@ossy/users/tasks/request-email-change' }
 
 const log = createLogger('@ossy/users/tasks/request-email-change')
 
-const isEmailLike = (maybeEmail) => /.@.+\.../.test(maybeEmail)
-
 /**
  * Request an email change for the authenticated user.
  * If the new email is already used by another account, returns `{ ok: true }`

package/src/user.aggregate.spec.js

@@ -1,39 +1,214 @@
 import { describe, expect, it } from '@jest/globals'
 import { User } from './user.aggregate.js'
 import { UsersEvents } from './users.events.js'
+import { UserSchema } from './schema-ids.js'
 
-describe('User.View email change', () => {
-  it('sets pendingEmail on EmailChangeRequested and updates email on EmailUpdated', () => {
-    const created = UsersEvents.Created({
-      email: 'old@example.com',
+const NOW = 1_700_000_000_000
+
+function createdEvent (overrides = {}) {
+  return {
+    ...UsersEvents.Created({
+      email: 'ada@example.com',
       firstName: 'Ada',
       lastName: 'Lovelace',
       userId: 'user-1',
+    }),
+    created: NOW,
+    ...overrides,
+  }
+}
+
+function withMeta (event, overrides = {}) {
+  return {
+    ...event,
+    created: NOW + 1000,
+    ...overrides,
+  }
+}
+
+describe('User.View', () => {
+
+  describe('empty event list', () => {
+    it('returns the savedState unchanged when no events are given', () => {
+      expect(User.View([], { id: 'user-1' })).toEqual({ id: 'user-1' })
+    })
+
+    it('uses {} as the default savedState', () => {
+      expect(User.View([])).toEqual({})
+    })
+  })
+
+  describe('Created event', () => {
+    it('sets identity and profile fields from the event', () => {
+      const result = User.View([createdEvent()])
+      expect(result).toMatchObject({
+        id: 'user-1',
+        type: 'User',
+        created: NOW,
+        email: 'ada@example.com',
+        firstName: 'Ada',
+        lastName: 'Lovelace',
+        workspaces: [],
+      })
+    })
+
+    it('preserves existing workspaces from savedState', () => {
+      const result = User.View([createdEvent()], { workspaces: ['ws-1'] })
+      expect(result.workspaces).toEqual(['ws-1'])
+    })
+
+    it('uses the user schema type on Created events', () => {
+      expect(createdEvent().type).toBe(UserSchema.user)
+    })
+  })
+
+  describe('SignInVerified', () => {
+    it('sets verifiedAt from the first verification event', () => {
+      const result = User.View([
+        createdEvent(),
+        withMeta(UsersEvents.SignInVerified({
+          createdBy: 'user-1',
+          token: 'tok',
+        }), { created: NOW + 2000 }),
+      ])
+      expect(result.verifiedAt).toBe(NOW + 2000)
+    })
+
+    it('keeps the earliest verifiedAt when verified again', () => {
+      const result = User.View([
+        createdEvent(),
+        withMeta(UsersEvents.SignInVerified({
+          createdBy: 'user-1',
+          token: 'tok-1',
+        }), { created: NOW + 2000 }),
+        withMeta(UsersEvents.SignInVerified({
+          createdBy: 'user-1',
+          token: 'tok-2',
+        }), { created: NOW + 3000 }),
+      ])
+      expect(result.verifiedAt).toBe(NOW + 2000)
     })
-    const requested = {
-      ...UsersEvents.EmailChangeRequested({
+  })
+
+  describe('NameUpdated', () => {
+    it('updates first and last name from the payload', () => {
+      const result = User.View([
+        createdEvent(),
+        withMeta(UsersEvents.NameUpdated({
+          firstName: 'Augusta',
+          lastName: 'Byron',
+          createdBy: 'user-1',
+        })),
+      ])
+      expect(result.firstName).toBe('Augusta')
+      expect(result.lastName).toBe('Byron')
+    })
+
+    it('keeps previous names when payload fields are empty', () => {
+      const result = User.View([
+        createdEvent(),
+        withMeta(UsersEvents.NameUpdated({
+          firstName: '',
+          lastName: '',
+          createdBy: 'user-1',
+        })),
+      ])
+      expect(result.firstName).toBe('Ada')
+      expect(result.lastName).toBe('Lovelace')
+    })
+  })
+
+  describe('email change', () => {
+    it('sets pendingEmail on EmailChangeRequested and updates email on EmailUpdated', () => {
+      const requested = withMeta(UsersEvents.EmailChangeRequested({
         email: 'new@example.com',
         createdBy: 'user-1',
-      }),
-      resourceId: 'user-1',
-      created: Date.now(),
-    }
-    const updated = {
-      ...UsersEvents.EmailUpdated({
+      }), { resourceId: 'user-1', created: NOW + 1 })
+      const updated = withMeta(UsersEvents.EmailUpdated({
         email: 'new@example.com',
-        previousEmail: 'old@example.com',
+        previousEmail: 'ada@example.com',
+        createdBy: 'user-1',
+      }), { resourceId: 'user-1', created: NOW + 2 })
+
+      const afterRequest = User.View([createdEvent(), requested])
+      expect(afterRequest.email).toBe('ada@example.com')
+      expect(afterRequest.pendingEmail).toBe('new@example.com')
+
+      const afterConfirm = User.View([createdEvent(), requested, updated])
+      expect(afterConfirm.email).toBe('new@example.com')
+      expect(afterConfirm.pendingEmail).toBeUndefined()
+    })
+  })
+
+  describe('WorkspaceJoined and WorkspaceLeft', () => {
+    it('adds a workspace id without duplicates', () => {
+      const joined = withMeta(UsersEvents.WorkspaceJoined({
+        workspaceId: 'ws-1',
+        createdBy: 'user-1',
+      }))
+      const result = User.View([createdEvent(), joined, joined])
+      expect(result.workspaces).toEqual(['ws-1'])
+    })
+
+    it('removes a workspace id on WorkspaceLeft', () => {
+      const result = User.View([
+        createdEvent(),
+        withMeta(UsersEvents.WorkspaceJoined({
+          workspaceId: 'ws-1',
+          createdBy: 'user-1',
+        })),
+        withMeta(UsersEvents.WorkspaceJoined({
+          workspaceId: 'ws-2',
+          createdBy: 'user-1',
+        }), { created: NOW + 2000 }),
+        withMeta(UsersEvents.WorkspaceLeft({
+          workspaceId: 'ws-1',
+          createdBy: 'user-1',
+        }), { created: NOW + 3000 }),
+      ])
+      expect(result.workspaces).toEqual(['ws-2'])
+    })
+  })
+
+  describe('unknown event type', () => {
+    it('ignores unknown events and returns state unchanged', () => {
+      const unknown = { event: 'SomethingElse', payload: {} }
+      expect(User.View([createdEvent(), unknown]).email).toBe('ada@example.com')
+    })
+  })
+})
+
+describe('User.UserForWorkspace', () => {
+  it('projects the workspace-facing user fields', () => {
+    const projection = User.UserForWorkspace([createdEvent()])
+    expect(projection).toEqual({
+      id: 'user-1',
+      firstName: 'Ada',
+      lastName: 'Lovelace',
+      email: 'ada@example.com',
+      type: 'User',
+    })
+  })
+})
+
+describe('User.History', () => {
+  it('returns event types newest first', () => {
+    const history = User.History([
+      { ...createdEvent(), created: NOW },
+      withMeta(UsersEvents.NameUpdated({
+        firstName: 'Augusta',
+        lastName: 'Byron',
+        createdBy: 'user-1',
+      }), { created: NOW + 5000 }),
+      withMeta(UsersEvents.SignInVerified({
         createdBy: 'user-1',
-      }),
-      resourceId: 'user-1',
-      created: Date.now() + 1,
-    }
-
-    const afterRequest = User.View([created, requested])
-    expect(afterRequest.email).toBe('old@example.com')
-    expect(afterRequest.pendingEmail).toBe('new@example.com')
-
-    const afterConfirm = User.View([created, requested, updated])
-    expect(afterConfirm.email).toBe('new@example.com')
-    expect(afterConfirm.pendingEmail).toBeUndefined()
+        token: 'tok',
+      }), { created: NOW + 2000 }),
+    ])
+    expect(history).toEqual([
+      { type: 'NameUpdated', created: NOW + 5000 },
+      { type: 'SignInVerified', created: NOW + 2000 },
+      { type: 'Created', created: NOW },
+    ])
   })
 })