Merge pull request #950 from trycompai/claudio/stripe

[dev] [claudfuen] claudio/stripe

Author: claudfuen

apps/app/src/app/api/auth/invitation/route.ts

@@ -19,6 +19,6 @@ export async function GET(request: Request) {
     return redirect(`/auth?inviteCode=${encodeURIComponent(inviteCode)}`);
   }
 
-  // If logged in, redirect to the invitation page
+  // If logged in, redirect to the invitation page, which will handle validation
   return redirect(`/invite/${inviteCode}`);
 }

apps/app/src/components/github-sign-in.tsx

@@ -13,10 +13,11 @@ export function GithubSignIn({ inviteCode }: { inviteCode?: string }) {
   const handleSignIn = async () => {
     setLoading(true);
 
-    const redirectTo = inviteCode ? `/api/auth/invitation?code=${inviteCode}` : '/';
+    const redirectTo = inviteCode ? `/invite/${inviteCode}` : '/';
 
     await authClient.signIn.social({
       provider: 'github',
+      callbackURL: redirectTo,
     });
   };
 

apps/app/src/components/google-sign-in.tsx

@@ -15,11 +15,12 @@ export function GoogleSignIn({ inviteCode }: { inviteCode?: string }) {
     let redirectTo = '/';
 
     if (inviteCode) {
-      redirectTo = `/api/auth/invitation?code=${inviteCode}`;
+      redirectTo = `/invite/${inviteCode}`;
     }
 
     await authClient.signIn.social({
       provider: 'google',
+      callbackURL: redirectTo,
     });
   };
 

apps/framework-editor/app/(pages)/auth/google-sign-in.tsx

@@ -15,11 +15,12 @@ export function GoogleSignIn({ inviteCode }: { inviteCode?: string }) {
     let redirectTo = '/';
 
     if (inviteCode) {
-      redirectTo = `/api/auth/invitation?code=${inviteCode}`;
+      redirectTo = `/invite/${inviteCode}`;
     }
 
     await authClient.signIn.social({
       provider: 'google',
+      callbackURL: redirectTo,
     });
   };