Fix join onboarding bounce after a successful invite accept.

Profile onboarded was written outside the store cache, so the app gate sent users back to the join form with a consumed invite; also revive soft-deleted members on accept.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Herklos

apps/mobile/src/app/(onboarding)/role.tsx

@@ -6,8 +6,9 @@ import { useAppAuth } from '@/lib/supabase-stores';
 import { useProfileMutations } from '@/lib/hooks/use-profile';
 import { useCompanyMutations } from '@/lib/hooks/use-companies';
 import { useInviteMutations } from '@/lib/hooks/use-invites';
-import { classifyInviteError, tokenFromInput } from '@chrono/sdk';
+import { classifyInviteError, fetchMyCompanies, tokenFromInput } from '@chrono/sdk';
 import type { InviteErrorKind } from '@chrono/sdk';
+import { globalSupabaseClient } from '@/lib/supabase';
 import { useActiveCompany } from '@/lib/active-company-context';
 import { AuthCard } from '@/components/common/AuthCard';
 import { useT } from '@/lib/i18n';
@@ -49,7 +50,7 @@ export default function RoleSetup() {
   const { completeOnboarding } = useProfileMutations();
   const { create } = useCompanyMutations();
   const { accept } = useInviteMutations();
-  const { refresh } = useActiveCompany();
+  const { refresh, setCompanyId } = useActiveCompany();
 
   const [mode, setMode] = useState<Mode>('create');
   const [fullName, setFullName] = useState('');
@@ -58,6 +59,12 @@ export default function RoleSetup() {
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string | undefined>();
 
+  const finish = async (activeCompanyId?: string) => {
+    await refresh();
+    if (activeCompanyId) setCompanyId(activeCompanyId);
+    router.replace('/(app)/(tabs)/home');
+  };
+
   const submit = async () => {
     if (!user?.id) return;
     if (!fullName.trim()) {
@@ -79,20 +86,33 @@ export default function RoleSetup() {
       if (mode === 'join') {
         // Join only by redeeming an invite token (accept_company_invite validates
         // the token server-side). Self-joining an arbitrary company is not allowed.
+        let companyId: string | undefined;
         try {
-          await accept(token);
+          companyId = await accept(token);
         } catch (e) {
-          setError(inviteJoinError(classifyInviteError(e), t));
-          setBusy(false);
-          return;
+          // Invite already consumed (e.g. PendingInviteRedeemer or a prior
+          // accept that bounced on the onboarded gate): if this user is already
+          // a member, finish onboarding instead of blocking on "used".
+          if (classifyInviteError(e) === 'used') {
+            const memberships = await fetchMyCompanies(globalSupabaseClient, user.id);
+            companyId = memberships[0]?.id;
+          }
+          if (!companyId) {
+            setError(inviteJoinError(classifyInviteError(e), t));
+            setBusy(false);
+            return;
+          }
         }
         await completeOnboarding(user.id, fullName.trim());
+        await finish(companyId);
       } else {
         await completeOnboarding(user.id, fullName.trim());
-        await create({ content: { name: companyName.trim() }, created_by: user.id });
+        await create({
+          content: { name: companyName.trim() },
+          created_by: user.id,
+        });
+        await finish();
       }
-      await refresh();
-      router.replace('/(app)/(tabs)/home');
     } catch (e) {
       setError(e instanceof Error ? e.message : t('onboarding.role.errGeneric'));
       setBusy(false);

apps/mobile/src/lib/hooks/use-profile.ts

@@ -3,9 +3,8 @@ import { useMutation } from '@drakkar.software/anchor/hooks';
 import { linkedQuery } from './linked-query';
 import { stores, useAppAuth } from '@/lib/supabase-stores';
 import { globalSupabaseClient } from '@/lib/supabase';
-import { completeOnboarding as sdkCompleteOnboarding, fetchProfile, fetchProfileBilling } from '@chrono/sdk';
+import { fetchProfile, fetchProfileBilling } from '@chrono/sdk';
 import type { Profile, ProfileBilling, TablesUpdate } from '@chrono/sdk';
-import { useAsyncAction } from './use-async-action';
 
 /** The signed-in user's profile, or another user's when `userId` is passed. */
 export function useProfile(userId?: string) {
@@ -63,14 +62,19 @@ export function useProfileMutations() {
     [update],
   );
 
-  const complete = useAsyncAction((userId: string, fullName: string) =>
-    sdkCompleteOnboarding(globalSupabaseClient, userId, fullName),
+  // Go through the profiles store (not a bare SDK update) so linked queries —
+  // especially the app layout's onboarded gate — see the new value immediately.
+  // A cache miss here used to bounce successful joins straight back to onboarding.
+  const completeOnboarding = useCallback(
+    (userId: string, fullName: string) =>
+      update(userId, { full_name: fullName, onboarded: true }),
+    [update],
   );
 
   return {
     updateProfile,
-    completeOnboarding: complete.mutateAsync,
-    isPending: isLoading || complete.isPending,
-    error: error ?? complete.error,
+    completeOnboarding,
+    isPending: isLoading,
+    error,
   };
 }

backend/supabase/migrations/20260811000000_invite_revive_soft_deleted.sql

@@ -0,0 +1,84 @@
+-- Invite accept: revive soft-deleted memberships; seat check ignores an
+-- already-active seat holder (ON CONFLICT re-insert / idempotent re-accept).
+
+create or replace function public.internal_insert_member_from_invite(
+  p_company_id uuid,
+  p_user_id uuid,
+  p_role public.app_role
+)
+returns void
+language plpgsql
+security definer
+set search_path = ''
+as $$
+begin
+  perform set_config('chrono.accepting_invite', 'on', true);
+  begin
+    insert into public.company_members (company_id, user_id, role)
+    values (p_company_id, p_user_id, p_role)
+    on conflict (company_id, user_id) do update
+      set
+        -- Soft-deleted members must become active again on re-invite.
+        deleted = false,
+        -- Keep an active member's role; apply invite role only when undeleting.
+        role = case
+          when company_members.deleted then excluded.role
+          else company_members.role
+        end,
+        updated_at = now();
+  exception
+    when others then
+      perform set_config('chrono.accepting_invite', 'off', true);
+      raise;
+  end;
+  perform set_config('chrono.accepting_invite', 'off', true);
+end;
+$$;
+
+revoke all on function public.internal_insert_member_from_invite(uuid, uuid, public.app_role) from public;
+revoke all on function public.internal_insert_member_from_invite(uuid, uuid, public.app_role) from anon, authenticated;
+
+create or replace function public.enforce_seat_limit()
+returns trigger
+language plpgsql
+security definer
+set search_path = ''
+as $$
+declare
+  v_limit integer;
+  v_count integer;
+begin
+  if new.deleted then
+    return new;
+  end if;
+
+  -- Already holding an active seat (idempotent accept / ON CONFLICT): not a new seat.
+  if exists (
+    select 1
+    from public.company_members cm
+    where cm.company_id = new.company_id
+      and cm.user_id = new.user_id
+      and cm.deleted = false
+  ) then
+    return new;
+  end if;
+
+  select seat_limit into v_limit
+  from public.company_subscriptions
+  where company_id = new.company_id;
+
+  if v_limit is null then
+    return new;
+  end if;
+
+  select count(*) into v_count
+  from public.company_members
+  where company_id = new.company_id and deleted = false;
+
+  if v_count >= v_limit then
+    raise exception 'Company has reached its seat limit (%) for the current plan', v_limit;
+  end if;
+
+  return new;
+end;
+$$;

backend/supabase/tests/database/040-company_invites_edge.test.sql

@@ -57,7 +57,7 @@ select ok(
   'Invite still marked accepted on conflict'
 );
 
--- 50 soft-deleted member redeeming again — unique conflict keeps deleted row
+-- 50 soft-deleted member redeeming again — undeletes and applies invite role
 select tests.clear_auth();
 update public.company_members
 set deleted = true
@@ -78,11 +78,12 @@ select lives_ok(
   'Soft-deleted member redeem does not error'
 );
 select tests.clear_auth();
-select ok(
+select is(
   (select deleted from public.company_members
    where company_id = (select company_id from edge_ctx)
      and user_id = 'dddddddd-dddd-dddd-dddd-ddddddddddd2'),
-  'Soft-deleted member stays deleted on conflict (documented)'
+  false,
+  'Soft-deleted member is revived on accept'
 );
 
 -- 51 seat limit: accept fails and invite remains unaccepted