Merge pull request joincalldotco#157 from joincalldotco/revert-156-fix/redirection-issues

Revert "Fix/redirection issues"

Author: yassratti

apps/web/app/(app)/layout.tsx

@@ -9,7 +9,8 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
     headers: await headers(),
   });
 
-  if (!session) redirect("/login");
+  // if (!session) redirect("/login");
+  if (!session) return null;
   return <SessionProvider value={session}>{children}</SessionProvider>;
 };
 

apps/web/components/app/section/_components/create-team-modal.tsx

@@ -38,7 +38,7 @@ export function CreateTeamModal({ onClose, onTeamCreated }: {
 
     const fetchContacts = async () => {
       try {
-        const res = await fetch(`${process.env.BACKEND_URL}/api/contacts`, {
+        const res = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_URL}/api/contacts`, {
           credentials: "include",
         });
         if (res.ok) {
@@ -87,7 +87,7 @@ export function CreateTeamModal({ onClose, onTeamCreated }: {
         members: selectedMembers,
       };
 
-      const res = await fetch(`${process.env.BACKEND_URL}/api/teams/create`, {
+      const res = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_URL}/api/teams/create`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

apps/web/components/app/section/team-section.tsx

@@ -50,55 +50,18 @@ export const TeamSection = () => {
     },
   });
 
-  
-  // Prevent hydration mismatch
-  useEffect(() => {
-    setMounted(true);
-  }, []);
-
-  const startTeamMeeting = async (team: Team) => {
-    try {
-      setStartingMeeting(team.id);
-      const res = await fetch(`${process.env.BACKEND_URL}/api/calls/create`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify({
-          name: `${team.name} Meeting`,
-          members: team.members.map((m) => m.email),
-          teamId: team.id,
-        }),
+  const { mutate: createCall, isPending: createCallPending } = useMutation({
+    mutationFn: CALLS_QUERY.createCall,
+    onSuccess: (data) => {
+      toast.success("Call created successfully", {
+        description: "Redirecting to call...",
       });
       router.push(`/app/call/${data.callId}`);
-
-    } catch (err) {
-      alert("Network error starting meeting");
-    } finally {
-      setStartingMeeting(null);
-    }
-  };
-
-  // Fetch contacts only when modal opens
-  useEffect(() => {
-    if (addUsersOpen) {
-      fetch(`${process.env.BACKEND_URL}/api/contacts`, { credentials: "include" })
-        .then(res => res.json())
-        .then(data => setContacts(data.contacts || []));
-    }
-  }, [addUsersOpen]);
-
-  const handleAddUsers = async () => {
-    if (!addUsersOpen) return;
-    setAddLoading(true);
-    setAddError(null);
-    try {
-      const res = await fetch(`${process.env.BACKEND_URL}/api/teams/${addUsersOpen}/add-members`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify({ emails: selectedContacts }),
-      });
-
+    },
+    onError: (error) => {
+      toast.error("Failed to create call");
+    },
+  });
 
   const startTeamMeeting = async (team: Team) => {
     createCall({

packages/auth/src/auth-client.ts

@@ -1,5 +1,5 @@
 import { createAuthClient } from "better-auth/react";
 
 export const authClient = createAuthClient({
-  baseURL: process.env.NEXT_PUBLIC_BACKEND_URL || "http://localhost:1284",
+  baseURL: process.env.BACKEND_URL,
 });

packages/auth/src/auth.ts

@@ -29,26 +29,6 @@ export const auth = betterAuth({
 
   trustedOrigins: [process.env.FRONTEND_URL, process.env.BACKEND_URL],
 
-  // Add cookie configuration for cross-domain support
-  session: {
-    cookieCache: {
-      enabled: true,
-      maxAge: 60 * 60 * 24 * 7, // 7 days
-    },
-  },
-
-  // Cookie configuration for cross-domain
-  cookies: {
-    sessionToken: {
-      name: "better-auth.session-token",
-      httpOnly: true,
-      secure: process.env.NODE_ENV === "production",
-      sameSite: process.env.NODE_ENV === "production" ? "none" : "lax",
-      domain: process.env.NODE_ENV === "production" ? ".joincall.co" : undefined,
-      maxAge: 60 * 60 * 24 * 7, // 7 days
-    },
-  },
-
   emailAndPassword: {
     enabled: true,
     autoSignIn: true,