@ossy/platform 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -44,16 +44,17 @@
     "@aws-sdk/util-create-request": "^3.972.26",
     "@aws-sdk/util-format-url": "^3.972.17",
     "@modelcontextprotocol/sdk": "^1.12.1",
-    "@ossy/app": "^3.0.1",
-    "@ossy/event-store": "^3.0.1",
-    "@ossy/locale": "^3.0.1",
-    "@ossy/observability": "^3.0.1",
-    "@ossy/policies": "^3.0.1",
-    "@ossy/schema": "^3.0.1",
-    "@ossy/sdk": "^3.0.1",
-    "@ossy/tokens": "^3.0.1",
-    "@ossy/users": "^3.0.1",
-    "@ossy/workspaces": "^3.0.1",
+    "@ossy/config": "^3.0.3",
+    "@ossy/event-store": "^3.0.3",
+    "@ossy/locale": "^3.0.3",
+    "@ossy/manifest": "^3.0.3",
+    "@ossy/observability": "^3.0.3",
+    "@ossy/policies": "^3.0.3",
+    "@ossy/schema": "^3.0.3",
+    "@ossy/sdk": "^3.0.3",
+    "@ossy/tokens": "^3.0.3",
+    "@ossy/users": "^3.0.3",
+    "@ossy/workspaces": "^3.0.3",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -73,5 +74,5 @@
     "src",
     "Dockerfile"
   ],
-  "gitHead": "4a70ec216448680d2fddc57b2a8a0077489720ae"
+  "gitHead": "8d098a04b595b2d1f54788c5c7ed7f310e9cd7e1"
 }

package/src/accept-invitation.api.js

@@ -0,0 +1,46 @@
+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/audit/list-task-runs.task.js

@@ -12,6 +12,6 @@ export async function run ({ payload, req }) {
     throw Object.assign(new Error('workspaceId required'), { status: 400 })
   }
 
-  const projection = await getProjection(TaskRunListProjection.ProjectionId, workspaceId)
-  return projection?.state ?? TaskRunListProjection.initialState(workspaceId)
+  const projection = await getProjection(workspaceId, TaskRunListProjection.ProjectionId)
+  return projection ?? TaskRunListProjection.initialState(workspaceId)
 }

package/src/config.service.js

@@ -1,48 +1 @@
-/**
- * API Configuration
- * @class
- */
-export class ConfigService {
-
-  static Port = process.env.BE_PORT || 3000
-  static Domain = process.env.DOMAIN || `localhost:${ConfigService.Port}`
-  static WebClientDomain = process.env.WEB_CLIENT_DOMAIN || `http://localhost:3000`
-  static MongoUrl = process.env.DB_URL || 'mongodb://mongodb:27017/'
-  static DbName = process.env.DB_NAME || 'test'
-  static TokenSecret = process.env.TOKEN_SECRET || 'testsecret2'
-  static TokenValidity = process.env.TOKEN_VALIDITY || 60 * 60 * 24 * 14
-  static LimitedAccessCode = process.env.LIMITED_ACCESS_CODE || 'test'
-  static BuildEnvironment = process.env.BUILD_ENVIRONMENT
-  static BotUserEmail = process.env.BOT_USER_EMAIL || 'ossybot@ossy.se'
-  static BotUserId = process.env.BOT_USER_ID || 'Mil5qAL7jDFCTyuKD_BKb'
-  /** Set on `req.userId` when there is no valid session; role checks can treat this as unauthenticated. */
-  static AnonymousUserId = process.env.ANONYMOUS_USER_ID || 'anonymous'
-  static MediaRepository = process.env.MEDIA_REPOSITORY
-  static MediaCdnDomainName = process.env.MEDIA_CDN_DOMAIN_NAME
-  static awsAccessKeyId = process.env.AWS_ACCESS_KEY_ID
-  static awsSecretAccessKey = process.env.AWS_SECRET_ACCESS_KEY
-  static SesRegion = process.env.SES_REGION || 'eu-north-1'
-  static Debug = process.env.DEBUG
-
-  /**
-   * Derives the web client base URL from the incoming request's Origin or Referer
-   * header so that email links point back to whichever domain the user came from
-   * (e.g. http://ossy.local, http://localhost:3002).  Falls back to the
-   * WEB_CLIENT_DOMAIN env var / default when no header is present.
-   */
-  static getWebClientBaseUrl(req) {
-    const origin = req?.headers?.origin
-    if (origin && origin !== 'null') return origin
-
-    const referer = req?.headers?.referer
-    if (referer) {
-      try {
-        const { origin: refOrigin } = new URL(referer)
-        if (refOrigin && refOrigin !== 'null') return refOrigin
-      } catch {}
-    }
-
-    return ConfigService.WebClientDomain
-  }
-
-}
+export { ConfigService } from '@ossy/config'

package/src/mcp/create-ossy-mcp-server.js

@@ -3,7 +3,7 @@ import { jsonSchemaToZodShape } from './json-schema-to-zod.js'
 import {
   TASK_TOPOLOGY_RESOURCE_URI,
   capabilitiesTaskTopologyResource,
-} from '@ossy/app/manifest/build-capabilities'
+} from '@ossy/manifest/build-capabilities'
 
 /**
  * @param {{

package/src/mcp/mount-platform-mcp.js

@@ -1,4 +1,4 @@
-import { buildCapabilities } from '@ossy/app/manifest/build-capabilities'
+import { buildCapabilities } from '@ossy/manifest/build-capabilities'
 import { mountOssyMcp } from './mount-ossy-mcp.js'
 import { uploadFileToolHandler, UPLOAD_FILE_TOOL } from './upload-file-tool.js'
 import { ActionService } from '../actions/action.service.js'

package/src/resources/schema.registry.js

@@ -1,26 +1 @@
-import { createLogger } from '@ossy/observability'
-
-const log = createLogger('platform')
-
-/** @type {object[]} */
-const systemSchemas = []
-
-/**
- * Register a single schema POJO (as inlined in `build/manifest.json`).
- *
- * @param {object} schema
- */
-export function registerSchema (schema) {
-  if (!schema || typeof schema !== 'object' || Array.isArray(schema)) return
-  if (typeof schema.id !== 'string' || schema.id.trim() === '') return
-  if (systemSchemas.find(s => s.id === schema.id)) return
-  systemSchemas.push(schema)
-  log.info(`[SchemaRegistry] Registered system schema: ${schema.id}`)
-}
-
-/**
- * @returns {object[]}
- */
-export function getSystemSchemas () {
-  return systemSchemas
-}
+export { registerSchema, getSystemSchemas } from '@ossy/schema'

package/src/resources/schema.validation.js

@@ -1,90 +1,6 @@
-import { Schema } from '@ossy/schema'
-
-/** Field input types accepted in schema definitions (UI + API contract). */
-export const ALLOWED_FIELD_TYPES = new Set([
-  'text',
-  'email',
-  'textarea',
-  'richtext',
-  'number',
-  'select',
-  'multiselect',
-  'file',
-  'image',
-  'boolean',
-  'date',
-  'timestamp',
-  'date-range',
-  'date-ranges',
-  'id',
-  'path',
-])
-
-/**
- * Normalize template field `type` to the canonical editor type.
- * `image` is an alias for `file` with default `accept: 'image/*'` when accept is omitted.
- *
- * @param {string | undefined} type
- * @returns {{ type: string, defaultAccept?: string }}
- */
-export function normalizeFieldType (type) {
-  const raw = typeof type === 'string' ? type.trim() : ''
-  if (raw === 'image') return { type: 'file', defaultAccept: 'image/*' }
-  return { type: raw }
-}
-
-/**
- * @param {{ type?: string, accept?: string, min?: number, max?: number } & Record<string, unknown>} field
- */
-export function resolveFieldDef (field) {
-  const { type: canonical, defaultAccept } = normalizeFieldType(field?.type)
-  return {
-    ...field,
-    type: canonical,
-    accept: field?.accept ?? defaultAccept,
-    max: field?.max ?? 1,
-  }
-}
-
-/**
- * Validates a batch import of workspace schemas.
- *
- * @param {unknown} templates
- * @param {Set<string>} reservedIds - System schema ids that must not be redefined
- * @returns {{ ok: true } | { ok: false, code: string, message: string }}
- */
-export function validateSchemasForImport (templates, reservedIds) {
-  if (!Array.isArray(templates)) {
-    return { ok: false, code: 'INVALID_PAYLOAD', message: 'Body must be a JSON array of schemas' }
-  }
-
-  const engine = Schema.of({ schemas: templates })
-  const seenIds = new Set()
-
-  for (const template of templates) {
-    if (reservedIds?.has(template?.id)) {
-      return {
-        ok: false,
-        code: 'RESERVED_SCHEMA_ID',
-        message: `Template id "${template.id}" is reserved by a system template`,
-      }
-    }
-
-    const result = engine.validate(template)
-    if (!result.ok) {
-      const first = result.errors[0]
-      return { ok: false, code: first.code, message: first.message }
-    }
-
-    if (seenIds.has(template.id)) {
-      return {
-        ok: false,
-        code: 'DUPLICATE_SCHEMA_ID',
-        message: `Duplicate schema id "${template.id}" in import payload`,
-      }
-    }
-    seenIds.add(template.id)
-  }
-
-  return { ok: true }
-}
+export {
+  validateSchemasForImport,
+  ALLOWED_FIELD_TYPES,
+  normalizeFieldType,
+  resolveFieldDef,
+} from '@ossy/schema'

package/src/runtime.js

@@ -6,7 +6,7 @@ import morgan from 'morgan'
 import { Router as OssyRouter } from '@ossy/router'
 import { loadManifest, resolveEntryUrl, loadLayoutsById, resolvePageLayoutRender } from './server.js'
 import { resolveRequestLocale } from './locale.js'
-import { buildManifestSummary } from '@ossy/app/manifest/build-manifest-summary'
+import { buildManifestSummary } from '@ossy/manifest/build-manifest-summary'
 import { ProxyInternal } from './proxy-internal.js'
 import { loadSite, invalidateSite } from './site-loader.js'
 import { createLogger } from '@ossy/observability'

package/src/select-workspace.api.js

@@ -0,0 +1,50 @@
+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' })
+  }
+}

package/src/server.js

@@ -10,7 +10,7 @@ import { SDK, resolveActionId } from '@ossy/sdk'
 import { AggregateRebuild, ensureEventStoreIndexes, Mongo, resolveMongoUrl } from '@ossy/event-store'
 import { TaskService } from './tasks/task-service.js'
 import { ChangeStream } from './tasks/change-stream.js'
-import { buildManifestSummary } from '@ossy/app/manifest/build-manifest-summary'
+import { buildManifestSummary } from '@ossy/manifest/build-manifest-summary'
 import { registerSchema } from './resources/schema.registry.js'
 import { initPlatformSchema } from './resources/schema.service.js'
 import { IntegrationService } from './integration.service.js'

package/src/site-loader.js

@@ -42,7 +42,7 @@ async function resolveWorkspaceId (domain) {
 
 /**
  * BFS walk of CMS resources under `location`, collecting all file resources recursively.
- * Directories have `type === 'directory'`; files have `content.src`.
+ * Directories have `type === 'directory'` or `@ossy/platform/schema/directory`; files have `content.src`.
  *
  * @param {ReturnType<typeof SDK.of>} sdk
  * @param {string} location  e.g. `/@ossy/apps/ossy.se`
@@ -62,7 +62,7 @@ async function collectFiles (sdk, location) {
 
     for (const r of resources) {
       const relPath = prefix ? `${prefix}/${r.name}` : r.name
-      if (r.type === 'directory') {
+      if (r.type === '@ossy/platform/schema/directory' || r.type === 'directory') {
         queue.push({ location: `${loc}/${r.name}`, prefix: relPath })
       } else if (r.content?.src) {
         results.push({ resource: r, relPath })