spine-framework 0.3.67 → 0.3.69

package/.framework/cli/commands/install-app.ts

@@ -246,6 +246,10 @@ async function seedApp(appDir: string, appSlug: string) {
         app_type: 'custom',
         source: 'npm',
         is_active: true,
+        route_prefix: manifest.route_prefix ?? ('/' + appSlug),
+        renderer: manifest.renderer ?? 'custom',
+        // min_role: first entry of required_roles array, or explicit min_role field
+        min_role: manifest.required_roles?.[0] ?? manifest.min_role ?? null,
       },
       { onConflict: 'slug' }
     )

package/.framework/src/pages/auth/RegisterPage.tsx

@@ -243,18 +243,21 @@ export function RegisterPage() {
       // Determine role and account strategy from URL params or config
       const urlRole = searchParams.get('role')
       const urlApp = searchParams.get('app')
+
+      // Resolve which app config to use: URL param → default_app → none
+      const effectiveApp = urlApp || regConfig?.default_app
       
       let effectiveRole = regConfig?.default_role || 'member'
       let effectiveAccountStrategy: 'existing' | 'new' | 'choice' = 'new'
       let targetAccount: string | undefined
       
-      // If app is specified, use app's configuration
-      if (urlApp && regConfig?.apps[urlApp]) {
-        const appConfig = regConfig.apps[urlApp]
+      // If an app config is found (via URL param or default_app), apply it
+      if (effectiveApp && regConfig?.apps[effectiveApp]) {
+        const appConfig = regConfig.apps[effectiveApp]
         
-        console.log('App config found:', appConfig)
+        console.log('App config found:', { app: effectiveApp, appConfig })
         
-        // Determine role
+        // Determine role: URL param (if valid for this app) → app default → config default
         if (urlRole && appConfig.roles.includes(urlRole)) {
           effectiveRole = urlRole
         } else {
@@ -297,10 +300,12 @@ export function RegisterPage() {
       }
 
       // Handle account creation vs existing account assignment
+      // IMPORTANT: use effectiveAccountStrategy (local var), NOT accountStrategy (React state)
+      // React state updates are async — accountStrategy may still hold the previous value here
       let registrationResult
-      console.log('Registration decision:', { accountStrategy, targetAccount, effectiveRole })
+      console.log('Registration decision:', { effectiveAccountStrategy, targetAccount, effectiveRole })
       
-      if (accountStrategy === 'existing' && targetAccount) {
+      if (effectiveAccountStrategy === 'existing' && targetAccount) {
         // Assign to existing account
         console.log('Using existing_account path')
         registrationResult = await callInvitesApi('complete-registration', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spine-framework",
-  "version": "0.3.67",
+  "version": "0.3.69",
   "description": "Multi-tenant, modular application platform for modern SaaS systems",
   "type": "module",
   "bin": {

package/scripts/assemble-functions.sh

@@ -42,13 +42,33 @@ fi
 
 # 3. Overlay custom functions (overrides + additions), excluding test files
 CUSTOM_COUNT=0
+
+# 3a. Copy functions from custom/functions/
 if [ -d "$CUSTOM_DIR/functions" ]; then
   # Copy all files except test files (*-test.ts, *.test.ts)
   find "$CUSTOM_DIR/functions" -maxdepth 1 -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' -exec cp {} "$TMP_DIR"/ \; 2>/dev/null || true
   # Copy subdirectories if any
   find "$CUSTOM_DIR/functions" -mindepth 1 -type d -exec sh -c 'dir="$1"; base=$(basename "$dir"); mkdir -p "'"$TMP_DIR"'/$base" && cp -r "$dir"/* "'"$TMP_DIR"'/$base/"' _ {} \; 2>/dev/null || true
-  CUSTOM_COUNT=$(find "$CUSTOM_DIR/functions" -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' 2>/dev/null | wc -l | tr -d ' ')
-  echo "  ✓ Custom: $CUSTOM_COUNT files"
+  CUSTOM_COUNT=$((CUSTOM_COUNT + $(find "$CUSTOM_DIR/functions" -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' 2>/dev/null | wc -l | tr -d ' ')))
+fi
+
+# 3b. Copy functions from custom/apps/*/functions/
+if [ -d "$CUSTOM_DIR/apps" ]; then
+  for app_dir in "$CUSTOM_DIR/apps"/*; do
+    if [ -d "$app_dir/functions" ]; then
+      # Copy all files except test files (*-test.ts, *.test.ts)
+      find "$app_dir/functions" -maxdepth 1 -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' -exec cp {} "$TMP_DIR"/ \; 2>/dev/null || true
+      # Copy subdirectories if any
+      find "$app_dir/functions" -mindepth 1 -type d -exec sh -c 'dir="$1"; base=$(basename "$dir"); mkdir -p "'"$TMP_DIR"'/$base" && cp -r "$dir"/* "'"$TMP_DIR"'/$base/"' _ {} \; 2>/dev/null || true
+      APP_COUNT=$(find "$app_dir/functions" -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' 2>/dev/null | wc -l | tr -d ' ')
+      CUSTOM_COUNT=$((CUSTOM_COUNT + APP_COUNT))
+      echo "  ✓ $(basename "$app_dir"): $APP_COUNT files"
+    fi
+  done
+fi
+
+if [ $CUSTOM_COUNT -gt 0 ]; then
+  echo "  ✓ Custom: $CUSTOM_COUNT total files"
 else
   echo "  ○ Custom: (empty)"
 fi