spine-framework 0.3.57 → 0.3.59

package/.framework/functions/invites.ts

@@ -213,7 +213,8 @@ export const validateToken = createHandler(async (_ctx, _body) => {
  *   (invite path is handled entirely in the DB trigger)
  */
 export const completeRegistration = createHandler(async (ctx, body) => {
-  const { path, account_name, email } = 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')
@@ -238,15 +239,50 @@ export const completeRegistration = createHandler(async (ctx, body) => {
       .eq('slug', 'account')
       .single()
 
-    // Resolve member_admin role (fall back to member if not seeded yet)
-    const { data: roles } = await adminDb
+    // 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')
-      .in('slug', ['member_admin', 'member'])
-      .order('slug')   // member_admin sorts before member
+      .select('id, slug')
+      .eq('slug', targetRoleSlug)
       .limit(1)
 
-    const role = roles?.[0]
+    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, 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) {
+      const { data: newRole, error: roleErr } = await adminDb
+        .from('roles')
+        .insert({
+          slug: 'member',
+          name: 'Member',
+          description: 'Default member role with basic permissions',
+          permissions: { items: ['read', 'create'], accounts: ['read'] },
+          is_active: true,
+        })
+        .select('id')
+        .single()
+
+      if (!roleErr && newRole) {
+        role = newRole
+      }
+    }
 
     // Create account
     const slug = generateAccountSlug(account_name)
@@ -282,17 +318,28 @@ export const completeRegistration = createHandler(async (ctx, body) => {
   }
 
   if (path === 'join_request') {
-    const { target_account_id } = body
+    const { target_account_id, role_slug } = body
     if (!target_account_id) throw new Error('target_account_id is required for join_request')
 
-    // Resolve member role
-    const { data: roles } = await adminDb
+    // Resolve role from role_slug param, or fall back to member
+    const targetRoleSlug = role_slug || 'member'
+    let { data: roles } = await adminDb
       .from('roles')
       .select('id')
-      .eq('slug', 'member')
+      .eq('slug', targetRoleSlug)
       .limit(1)
 
-    const role = roles?.[0]
+    let role = roles?.[0]
+
+    // Fallback to member if specific role not found
+    if (!role) {
+      const { data: fallbackRoles } = await adminDb
+        .from('roles')
+        .select('id')
+        .eq('slug', 'member')
+        .limit(1)
+      role = fallbackRoles?.[0]
+    }
 
     // Resolve type_id
     const { data: personType } = await adminDb

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

@@ -234,11 +234,17 @@ export function RegisterPage() {
       // 4. Walk-up paths — call complete-registration
       const resolvedEmail = email
 
+      // 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'
+
       if (domainMatchChoice === 'join') {
         // Join existing account as access_request
         const joinResult = await callInvitesApi('complete-registration', {
           path: 'join_request',
           email: resolvedEmail,
+          role_slug: effectiveRole,
         }, 'POST')
 
         if (joinResult.error) {
@@ -255,6 +261,7 @@ export function RegisterPage() {
         path: 'new_account',
         email: resolvedEmail,
         account_name: accountName,
+        role_slug: effectiveRole,
       }, 'POST')
 
       if (newResult.error) {

package/package.json

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