spine-framework 0.3.58 → 0.3.60

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

@@ -309,7 +309,8 @@ interface SpineConfig {
     default_role?: string
     allow_url_override?: boolean
     apps?: Record<string, {
-      role: string
+      roles: string[]
+      default_role: string
       path: string
       enabled: boolean
     }>
@@ -344,9 +345,10 @@ function updateRegistrationConfig(appSlug: string, regConfig: RegistrationConfig
     config.registration.apps = {}
   }
 
-  // Add/update this app's registration entry
+  // Add/update this app's registration entry with multi-role support
   config.registration.apps[appSlug] = {
-    role: regConfig.default_role,
+    roles: [regConfig.default_role], // Start with default role from manifest
+    default_role: regConfig.default_role,
     path: regConfig.redirect_path,
     enabled: regConfig.enabled,
   }

package/.framework/functions/invites.ts

@@ -214,6 +214,7 @@ export const validateToken = createHandler(async (_ctx, _body) => {
  */
 export const completeRegistration = createHandler(async (ctx, body) => {
   const { path, account_name, email, role_slug } = body
+  console.log('completeRegistration called with:', { path, account_name, email, role_slug })
 
   if (!path || !email) {
     throw new Error('path and email are required')
@@ -240,27 +241,33 @@ export const completeRegistration = createHandler(async (ctx, body) => {
 
     // Resolve role from role_slug param, or fall back to member_admin/member lookup
     const targetRoleSlug = role_slug || 'member'
+    console.log('Looking for role:', targetRoleSlug)
+    
     let { data: roles } = await adminDb
       .from('roles')
-      .select('id')
+      .select('id, slug')
       .eq('slug', targetRoleSlug)
       .limit(1)
 
     let role = roles?.[0]
+    console.log('Found role:', role)
 
     // If specific role not found, try member_admin or member as fallback
     if (!role) {
+      console.log('Role not found, trying fallbacks...')
       const { data: fallbackRoles } = await adminDb
         .from('roles')
-        .select('id')
+        .select('id, slug')
         .in('slug', ['member_admin', 'member'])
         .order('slug')
         .limit(1)
       role = fallbackRoles?.[0]
+      console.log('Fallback role:', role)
     }
 
-    // If no roles exist yet (apps not installed), create a default member role
-    if (!role) {
+    // If no roles exist yet and no specific role was requested, create a default member role
+    // But only if we're not trying to assign a specific app role
+    if (!role && !role_slug) {
       const { data: newRole, error: roleErr } = await adminDb
         .from('roles')
         .insert({

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

@@ -53,7 +53,8 @@ interface RegistrationConfig {
   default_role: string
   allow_url_override: boolean
   apps: Record<string, {
-    role: string
+    roles: string[]
+    default_role: string
     path: string
     enabled: boolean
   }>
@@ -237,7 +238,27 @@ export function RegisterPage() {
       // Determine role from URL params or config
       const urlRole = searchParams.get('role')
       const urlApp = searchParams.get('app')
-      const effectiveRole = urlRole || (urlApp && regConfig?.apps[urlApp]?.role) || regConfig?.default_role || 'member'
+      console.log('Role resolution:', { urlRole, urlApp, regConfig })
+      
+      let effectiveRole = regConfig?.default_role || 'member'
+      
+      // If app is specified, use app's default role
+      if (urlApp && regConfig?.apps[urlApp]) {
+        const appConfig = regConfig.apps[urlApp]
+        
+        // If URL role is provided, validate it against app's available roles
+        if (urlRole && appConfig.roles.includes(urlRole)) {
+          effectiveRole = urlRole
+        } else {
+          effectiveRole = appConfig.default_role
+        }
+      }
+      // If only URL role is specified (no app), use it directly
+      else if (urlRole) {
+        effectiveRole = urlRole
+      }
+      
+      console.log('Effective role:', effectiveRole)
 
       if (domainMatchChoice === 'join') {
         // Join existing account as access_request

package/package.json

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

package/spine.config.json

@@ -6,12 +6,14 @@
     "allow_url_override": true,
     "apps": {
       "portal": {
-        "role": "member",
+        "roles": ["member"],
+        "default_role": "member",
         "path": "/portal",
         "enabled": true
       },
       "cortex": {
-        "role": "support",
+        "roles": ["support", "support_admin"],
+        "default_role": "support",
         "path": "/cortex",
         "enabled": true
       }