@ossy/app 3.11.0 → 3.12.0

package/README.md

@@ -76,7 +76,7 @@ import { CloudLight } from '@ossy/themes'
 export default {
   workspaceId: 'your-workspace-id',
   theme: CloudLight,
-  apiUrl: 'https://api.ossy.se/api/v0',
+  apiUrl: '/api/v0',
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -49,21 +49,22 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/authentication": "^3.11.0",
+    "@ossy/authentication": "^3.11.1",
     "@ossy/design-system": "^3.11.0",
     "@ossy/locale": "^3.4.0",
     "@ossy/manifest": "^3.9.0",
-    "@ossy/package-catalog": "^3.11.0",
+    "@ossy/package-catalog": "^3.12.0",
     "@ossy/pages": "^3.0.9",
-    "@ossy/platform": "^3.11.0",
-    "@ossy/resources": "^3.11.0",
+    "@ossy/platform": "^3.12.0",
+    "@ossy/resources": "^3.12.0",
     "@ossy/router": "^3.0.9",
     "@ossy/router-react": "^3.11.0",
     "@ossy/schema": "^3.8.0",
-    "@ossy/sdk": "^3.5.0",
-    "@ossy/sdk-react": "^3.11.0",
+    "@ossy/sdk": "^3.12.0",
+    "@ossy/sdk-react": "^3.12.0",
     "@ossy/themes": "^3.8.0",
-    "@ossy/workspaces": "^3.11.0",
+    "@ossy/users": "^3.12.0",
+    "@ossy/workspaces": "^3.12.0",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -97,5 +98,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "53ff8456920e09151c9d88df4a6c3ee958d811eb"
+  "gitHead": "c2650803219ad1831559b512848358d9550ffad2"
 }

package/src/shell/App.jsx

@@ -11,6 +11,7 @@ import { PageViewTracker } from './PageViewTracker.jsx'
 import { defaultAppSettings } from './AppSettings.jsx'
 import { Router } from '@ossy/router-react'
 import { AppContext } from './AppContext.js'
+import { UserSetupGuard } from './UserSetupGuard.jsx'
 
 export const App = ({ children, language, messages, fallbackMessages, sdk: sdkOverride, ..._appSettings }) => {
   const appSettings = { ...defaultAppSettings(), ..._appSettings }
@@ -43,7 +44,9 @@ export const App = ({ children, language, messages, fallbackMessages, sdk: sdkOv
               <WorkspaceAppSettingsSync />
               <Router {...appSettings} pages={appSettings.pages || []}>
                 <PageViewTracker />
-                {children}
+                <UserSetupGuard>
+                  {children}
+                </UserSetupGuard>
                 {appSettings.devMode && <ThemeEditor />}
               </Router>
             </WorkspaceProvider>

package/src/shell/PageViewTracker.jsx

@@ -1,8 +1,9 @@
 import { useEffect } from 'react'
 import { useRouter } from '@ossy/router-react'
 import { useSdk } from '@ossy/sdk-react'
-import { GetWorkspace } from '@ossy/workspaces'
-import { CreatePageView } from '@ossy/resources'
+import { getOrCreateVisitorId } from './visitor-id.js'
+
+const CreatePageView = { id: '@ossy/analytics/actions/create-page-view' }
 
 /** Survives Strict Mode remounts so the same navigation is not double-counted. */
 let lastRecordedKey = null
@@ -10,23 +11,22 @@ let lastRecordedAt = 0
 const DEDUPE_MS = 1500
 
 /**
- * Emit a page-view resource on client navigations so analytics can aggregate traffic.
- * No UI — mount once under the app shell / router.
+ * Emit a page-view on client navigations (anonymous and signed-in).
+ * Public ingest on `@ossy/analytics` — invoked by id so the shell does not
+ * depend on that feature package. Failures are silent.
  */
 export function PageViewTracker () {
   const router = useRouter()
   const sdk = useSdk()
-  const { data: workspace } = sdk.read(GetWorkspace)
 
   useEffect(() => {
     if (typeof window === 'undefined') return
-    if (!workspace?.id) return
 
     const path = window.location.pathname || '/'
     const section = window.location.hash
       ? window.location.hash.replace('#', '')
       : undefined
-    const key = `${workspace.id}:${path}:${section || ''}:${router.language || ''}`
+    const key = `${path}:${section || ''}:${router.language || ''}`
     const now = Date.now()
     if (lastRecordedKey === key && now - lastRecordedAt < DEDUPE_MS) return
     lastRecordedKey = key
@@ -37,9 +37,9 @@ export function PageViewTracker () {
       section,
       language: router.language,
       referrer: typeof document !== 'undefined' ? (document.referrer || undefined) : undefined,
-      eventAt: now,
+      visitorId: getOrCreateVisitorId(),
     }).catch(() => {})
-  }, [sdk, router.href, router.language, workspace?.id])
+  }, [sdk, router.href, router.language])
 
   return null
 }

package/src/shell/UserSetupGuard.jsx

@@ -0,0 +1,27 @@
+import React from 'react'
+import { GetCurrentUser } from '@ossy/authentication'
+import { CompleteUserNamePrompt, outstandingUserRequirements } from '@ossy/users'
+import { useSdk, AsyncStatus } from '@ossy/sdk-react'
+import { useApp } from './AppContext.js'
+
+/**
+ * After auth, block the current page until outstanding user requirements are met.
+ * Anonymous visits (public booking, sign-in, invite verify) are unchanged:
+ * `isAuthenticated` is still false on those first loads.
+ */
+export function UserSetupGuard ({ children }) {
+  const app = useApp()
+  const sdk = useSdk()
+  const enabled = Boolean(app?.isAuthenticated)
+  const { status, data: user, refetch } = sdk.read(GetCurrentUser, undefined, { enabled })
+
+  if (!enabled) return children
+  if (status !== AsyncStatus.Success || !user) return children
+
+  const nextRequirement = outstandingUserRequirements(user)[0]
+  if (nextRequirement === 'name') {
+    return <CompleteUserNamePrompt onCompleted={() => refetch()} />
+  }
+
+  return children
+}

package/src/shell/resolveEndpoints.js

@@ -1,3 +1,5 @@
+import { resolveActionsUrl } from '@ossy/sdk'
+
 /**
  * Resolve integration endpoint URLs from app context and browser origin.
  *
@@ -19,14 +21,9 @@ export function resolveEndpoints (app) {
       : ''
 
   const normalizedApi = apiUrl.replace(/\/$/, '')
-  let actionsUrl = '/actions'
-
-  if (normalizedApi.startsWith('http://') || normalizedApi.startsWith('https://')) {
-    actionsUrl = `${normalizedApi}/actions`
-  } else if (normalizedApi.startsWith('/')) {
-    actionsUrl = appOrigin ? `${appOrigin}${normalizedApi}/actions` : `${normalizedApi}/actions`
-  } else if (appOrigin) {
-    actionsUrl = `${appOrigin}/actions`
+  let actionsUrl = resolveActionsUrl(normalizedApi)
+  if (appOrigin && actionsUrl.startsWith('/')) {
+    actionsUrl = `${appOrigin}${actionsUrl}`
   }
 
   const mcpUrl = appOrigin ? `${appOrigin}/mcp` : '/mcp'

package/src/shell/visitor-id.js

@@ -0,0 +1,24 @@
+const STORAGE_KEY = 'ossy-visitor-id'
+
+/**
+ * Stable anonymous visitor id for page-view ingest (unique visitors).
+ * Returns undefined when storage is unavailable (SSR, blocked cookies).
+ *
+ * @param {{ getItem?: Function, setItem?: Function } | null} [storage]
+ * @returns {string | undefined}
+ */
+export function getOrCreateVisitorId (storage) {
+  const store = storage ?? (typeof globalThis !== 'undefined' ? globalThis.localStorage : null)
+  if (!store?.getItem || !store?.setItem) return undefined
+  try {
+    const existing = store.getItem(STORAGE_KEY)
+    if (existing) return existing
+    const id = typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
+      ? crypto.randomUUID()
+      : `${Date.now()}-${Math.random().toString(36).slice(2)}`
+    store.setItem(STORAGE_KEY, id)
+    return id
+  } catch {
+    return undefined
+  }
+}