@ossy/workspaces 3.4.0 → 3.5.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.4.0",
+  "version": "3.5.0",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ossy/config": "^3.0.9",
-    "@ossy/schema": "^3.4.0"
+    "@ossy/schema": "^3.5.0"
   },
   "peerDependencies": {
     "@ossy/design-system": ">=1.0.0",
@@ -45,5 +45,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "d36b69444268d172bc3e8e1dc77e67afc63f8650"
+  "gitHead": "23167600f991596f122765a53f2b9df08314e115"
 }

package/src/SchemasReadBootstrap.jsx

@@ -1,9 +1,12 @@
 import React, { useEffect } from 'react'
 import { AsyncStatus, cacheKey, useReadCacheStore } from '@ossy/sdk-react'
 import { metadata as GetSchemas } from './get-schemas.action.js'
+import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
 
 /**
  * Seed the GetSchemas read cache from SSR props so schema lookups work on first paint.
+ * If a client get-schemas response already landed but omitted system schemas (empty
+ * inlined registry), merge SSR schemas back in so create forms keep their fields.
  */
 export function SchemasReadBootstrap ({ schemas }) {
   const store = useReadCacheStore()
@@ -12,7 +15,17 @@ export function SchemasReadBootstrap ({ schemas }) {
     if (!Array.isArray(schemas) || schemas.length === 0) return
     const key = cacheKey(GetSchemas)
     const entry = store.getEntry(key)
-    if (entry.status === AsyncStatus.Success) return
+    if (entry.status === AsyncStatus.Success && Array.isArray(entry.data)) {
+      const cachedIds = new Set(entry.data.map((s) => s?.id).filter(Boolean))
+      const missing = schemas.some((s) => s?.id && !cachedIds.has(s.id))
+      if (!missing) return
+      store.setEntry(key, {
+        status: AsyncStatus.Success,
+        data: mergeWorkspaceSchemas(schemas, entry.data),
+        error: null,
+      })
+      return
+    }
     store.setEntry(key, { status: AsyncStatus.Success, data: schemas, error: null })
   }, [schemas, store])
 

package/src/accept-invitation.task.js

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import jwt from 'jsonwebtoken'
 import { Aggregate } from '@ossy/event-store'
 import { UserSchema } from '@ossy/users/server'
@@ -21,6 +22,26 @@ function verifyToken(token) {
   })
 }
 
+function createWebAuthSession (userId) {
+  const resourceId = randomUUID()
+  const signInExpiresIn = ConfigService.TokenValidity
+  const signInExpiresAt = Date.now() + signInExpiresIn * 1000
+  const signInToken = jwt.sign(
+    { sub: userId, type: 'WebAuth', jti: resourceId },
+    ConfigService.TokenSecret,
+    { expiresIn: signInExpiresIn },
+  )
+  const signInEvent = TokenEvents.Created({
+    resourceId,
+    type: 'WebAuth',
+    subject: userId,
+    createdBy: userId,
+    token: signInToken,
+    expiresAt: signInExpiresAt,
+  })
+  return { signInToken, signInExpiresAt, signInEvent }
+}
+
 export async function run({ payload, req }) {
   const workspaceId = payload?.workspaceId ?? req?.workspaceId
   const verificationToken = payload?.token ?? req?.query?.token
@@ -45,41 +66,28 @@ export async function run({ payload, req }) {
 
   if (existingUser) {
     userId = existingUser.id
-    const signInExpiresIn = ConfigService.TokenValidity
-    signInExpiresAt = Date.now() + signInExpiresIn * 1000
-    signInToken = jwt.sign({ sub: userId, type: 'WebAuth' }, ConfigService.TokenSecret, { expiresIn: signInExpiresIn })
-    const signInEvent = TokenEvents.Created({
-      type: 'WebAuth',
-      subject: userId,
-      createdBy: userId,
-      token: signInToken,
-      expiresAt: signInExpiresAt,
-    })
+    const session = createWebAuthSession(userId)
+    signInToken = session.signInToken
+    signInExpiresAt = session.signInExpiresAt
     const userInvitationAccepted = WorkspacesEvents.UserInvitationAccepted({ email, createdBy: userId })
     await Promise.all([
-      Aggregate.Of(Token, signInEvent),
+      Aggregate.Of(Token, session.signInEvent),
       Aggregate.Of(Workspace, resolvedWorkspaceId).then(Aggregate.Add(userInvitationAccepted)),
     ])
   } else {
     const signUpEvent = UsersEvents.Created({ email })
     userId = signUpEvent.createdBy
-    const signInExpiresIn = ConfigService.TokenValidity
-    signInExpiresAt = Date.now() + signInExpiresIn * 1000
-    signInToken = jwt.sign({ sub: userId, type: 'WebAuth' }, ConfigService.TokenSecret, { expiresIn: signInExpiresIn })
-    const signInEvent = TokenEvents.Created({
-      type: 'WebAuth',
-      subject: userId,
-      createdBy: userId,
-      token: signInToken,
-      expiresAt: signInExpiresAt,
-    })
+    const session = createWebAuthSession(userId)
+    signInToken = session.signInToken
+    signInExpiresAt = session.signInExpiresAt
     const userInvitationAccepted = WorkspacesEvents.UserInvitationAccepted({ email, createdBy: userId })
     await Promise.all([
       Aggregate.Of(User, signUpEvent),
-      Aggregate.Of(Token, signInEvent),
+      Aggregate.Of(Token, session.signInEvent),
       Aggregate.Of(Workspace, resolvedWorkspaceId).then(Aggregate.Add(userInvitationAccepted)),
     ])
   }
 
+  log.info('Invitation accepted; WebAuth session issued', { userId, workspaceId: resolvedWorkspaceId })
   return { authToken: signInToken, authExpiresAt: signInExpiresAt, workspaceId: resolvedWorkspaceId }
 }

package/src/get-schemas.task.js

@@ -1,6 +1,9 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
-import { getSystemSchemas } from '@ossy/schema'
+// Use the system-schemas subpath so Rollup can externalize the registry singleton
+// (same module `registerSchema` fills at server boot). A bare `@ossy/schema` import
+// gets inlined with an empty `systemSchemas` array and new manifest schemas vanish.
+import { getSystemSchemas } from '@ossy/schema/system-schemas'
 import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
 
 export const metadata = { id: '@ossy/workspaces/tasks/get-schemas' }

package/src/invite-user.task.js

@@ -5,12 +5,11 @@ 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 { isEmailLike } from '@ossy/schema'
 import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
 
 export const metadata = { id: '@ossy/workspaces/tasks/invite-user' }
 
-const isEmailLike = maybeEmail => /.@.+\.../.test(maybeEmail)
-
 function createVerificationToken(workspaceId) {
   const expiresIn = ConfigService.TokenValidity
   return jwt.sign({ aud: workspaceId }, ConfigService.TokenSecret, { expiresIn })