@ossy/workspaces 3.0.1 → 3.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -22,6 +22,10 @@
   "ossy": {
     "src": "./src"
   },
+  "dependencies": {
+    "@ossy/config": "^3.0.3",
+    "@ossy/schema": "^3.0.3"
+  },
   "peerDependencies": {
     "@ossy/design-system": ">=1.0.0",
     "@ossy/router-react": ">=1.0.0",
@@ -30,7 +34,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
-    "@ossy/platform": "^3.0.1",
     "casual": "^1.6.2",
     "jest": "^30.2.0"
   },
@@ -42,5 +45,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "4a70ec216448680d2fddc57b2a8a0077489720ae"
+  "gitHead": "8d098a04b595b2d1f54788c5c7ed7f310e9cd7e1"
 }

package/src/SelectWorkspacePage.jsx

@@ -24,7 +24,7 @@ export const SelectWorkspacePage = () => {
     : asyncStatus
 
   const setWorkspace = workspaceId => {
-    selectWorkspace(workspaceId, router.getHref('@home/home'))
+    selectWorkspace(workspaceId, router.getHref('@home') || '/')
   }
 
   return (

package/src/accept-invitation.task.js

@@ -4,7 +4,7 @@ import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { User, UsersEvents } from '@ossy/users/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
-import { ConfigService } from '@ossy/platform'
+import { ConfigService } from '@ossy/config'
 import { createLogger } from '@ossy/observability'
 
 export const metadata = { id: '@ossy/workspaces/tasks/accept-invitation' }

package/src/create.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
-import { ConfigService } from '@ossy/platform'
+import { ConfigService } from '@ossy/config'
 
 export const metadata = { id: '@ossy/workspaces/tasks/create' }
 

package/src/disable-service.task.js

@@ -10,6 +10,8 @@ export async function run({ payload, req }) {
   const service = assertEnableableService(payload?.service)
 
   const event = WorkspacesEvents.ServiceDisabled({ createdBy, service })
-  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
+  await Aggregate.Of(Workspace, workspaceId)
+    .then(Aggregate.Add(event))
+    .then(Aggregate.Save())
   return null
 }

package/src/enable-service.task.js

@@ -10,6 +10,8 @@ export async function run({ payload, req }) {
   const service = assertEnableableService(payload?.service ?? payload)
 
   const event = WorkspacesEvents.ServiceEnabled({ createdBy, service })
-  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
+  await Aggregate.Of(Workspace, workspaceId)
+    .then(Aggregate.Add(event))
+    .then(Aggregate.Save())
   return null
 }

package/src/get-schemas.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
-import { getSystemSchemas } from '@ossy/platform'
+import { getSystemSchemas } from '@ossy/schema'
 import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
 
 export const metadata = { id: '@ossy/workspaces/tasks/get-schemas' }

package/src/import-schemas.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
-import { validateSchemasForImport } from '@ossy/platform'
+import { validateSchemasForImport } from '@ossy/schema'
 
 export const metadata = { id: '@ossy/workspaces/tasks/import-schemas' }
 

package/src/invite-user.task.js

@@ -4,7 +4,7 @@ import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
 import { EmailRenderer } from '@ossy/email'
-import { ConfigService } from '@ossy/platform'
+import { ConfigService } from '@ossy/config'
 import { createLogger } from '@ossy/observability'
 import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
 

package/src/accept-invitation.api.js

@@ -1,46 +0,0 @@
-import {
-  ActionService,
-  mergeUserAppSettingsCookie,
-  setAuthCookie,
-} from '@ossy/platform'
-
-export const metadata = {
-  id: 'users.accept-invitation',
-  path: '/api/v0/users/accept-invitation',
-  action: '@ossy/workspaces/actions/accept-invitation',
-  method: 'GET',
-  query: ['token', 'workspaceId', 'redirect'],
-}
-
-export default async function handle (req, res) {
-  if (req.method !== 'GET') {
-    res.setHeader('Allow', 'GET')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-
-  try {
-    const { authToken, workspaceId } = await ActionService.invoke('@ossy/workspaces/actions/accept-invitation', {
-      payload: {
-        token: req.query.token,
-        workspaceId: req.query.workspaceId,
-      },
-      req,
-    })
-
-    setAuthCookie(res, authToken)
-    if (workspaceId) {
-      mergeUserAppSettingsCookie(req, res, { workspaceId })
-    }
-
-    const redirect = req.query.redirect
-    if (redirect && typeof redirect === 'string') {
-      res.redirect(302, redirect)
-      return
-    }
-
-    res.status(200).json('')
-  } catch (err) {
-    res.status(err.status || 401).json('')
-  }
-}

package/src/select-workspace.api.js

@@ -1,50 +0,0 @@
-import {
-  ActionService,
-  mergeUserAppSettingsCookie,
-} from '@ossy/platform'
-
-export const metadata = {
-  id: 'users.select-workspace',
-  path: '/api/v0/users/select-workspace',
-  method: 'GET',
-  query: ['workspaceId', 'redirect'],
-}
-
-export default async function handle (req, res) {
-  if (req.method !== 'GET') {
-    res.setHeader('Allow', 'GET')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-
-  if (!req.userId || req.userId === 'anonymous') {
-    res.status(401).json({ error: 'Unauthorized' })
-    return
-  }
-
-  const workspaceId = req.query.workspaceId
-  if (!workspaceId || typeof workspaceId !== 'string') {
-    res.status(400).json({ message: 'No workspaceId provided' })
-    return
-  }
-
-  try {
-    const workspaces = await ActionService.invoke('@ossy/workspaces/actions/list', { req })
-    if (!workspaces.some((w) => w.id === workspaceId)) {
-      res.status(403).json({ message: 'Forbidden' })
-      return
-    }
-
-    mergeUserAppSettingsCookie(req, res, { workspaceId })
-
-    const redirect = req.query.redirect
-    if (redirect && typeof redirect === 'string') {
-      res.redirect(302, redirect)
-      return
-    }
-
-    res.status(200).json('')
-  } catch (err) {
-    res.status(err.status || 500).json({ message: err.message || 'Internal Server Error' })
-  }
-}