From 43600419cb249c81948193855472e8f56e6704a2 Mon Sep 17 00:00:00 2001
From: KM Koushik <koushikmohan1996@gmail.com>
Date: Wed, 2 Apr 2025 20:59:20 +1100
Subject: [PATCH] join team should be authenticated (#144)

---
 apps/web/src/app/join-team/page.tsx | 12 +++++++++---
 apps/web/src/server/mailer.ts       |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/join-team/page.tsx b/apps/web/src/app/join-team/page.tsx
index 2cba242..01021f2 100644
--- a/apps/web/src/app/join-team/page.tsx
+++ b/apps/web/src/app/join-team/page.tsx
@@ -1,10 +1,16 @@
-"use client";
-
 import JoinTeam from "~/components/team/JoinTeam";
 import { Suspense } from "react";
 import Spinner from "@unsend/ui/src/spinner";
+import { getServerAuthSession } from "~/server/auth";
+import { redirect } from "next/navigation";
+
+export default async function CreateTeam() {
+  const session = await getServerAuthSession();
+
+  if (!session) {
+    redirect("/login");
+  }
 
-export default function CreateTeam() {
   return (
     <div className="flex items-center justify-center min-h-screen ">
       <div className=" w-[300px] flex flex-col gap-8">
diff --git a/apps/web/src/server/mailer.ts b/apps/web/src/server/mailer.ts
index 266dded..a5f5f47 100644
--- a/apps/web/src/server/mailer.ts
+++ b/apps/web/src/server/mailer.ts
@@ -78,7 +78,10 @@ async function sendMail(
       return;
     }
 
-    const domain = domains[0];
+    const fromEmailDomain = env.FROM_EMAIL?.split("@")[1];
+
+    const domain =
+      domains.find((d) => d.name === fromEmailDomain) ?? domains[0];
 
     await sendEmail({
       teamId: team.id,