Switch to nodemailer / resend for transactional mail

Author: brendan-kellam

packages/web/package.json

@@ -107,6 +107,7 @@
     "next": "14.2.21",
     "next-auth": "^5.0.0-beta.25",
     "next-themes": "^0.3.0",
+    "nodemailer": "^6.10.0",
     "posthog-js": "^1.161.5",
     "pretty-bytes": "^6.1.1",
     "psl": "^1.15.0",
@@ -128,6 +129,7 @@
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/node": "^20",
+    "@types/nodemailer": "^6.4.17",
     "@types/psl": "^1.1.3",
     "@types/react": "^18",
     "@types/react-dom": "^18",

packages/web/src/app/login/components/loginForm.tsx

@@ -49,7 +49,7 @@ export const LoginForm = ({ callbackUrl, error }: LoginFormProps) => {
     }
 
     const onSignInWithMagicLink = (values: z.infer<typeof magicLinkSchema>) => {
-        signIn("loops", { email: values.email, redirectTo: callbackUrl ?? "/" });
+        signIn("nodemailer", { email: values.email, redirectTo: callbackUrl ?? "/" });
     }
 
     const onSignInWithOauth = useCallback((provider: string) => {

packages/web/src/app/login/page.tsx

@@ -1,4 +1,6 @@
+import { auth } from "@/auth";
 import { LoginForm } from "./components/loginForm";
+import { redirect } from "next/navigation";
 
 interface LoginProps {
     searchParams: {
@@ -8,6 +10,11 @@ interface LoginProps {
 }
 
 export default async function Login({ searchParams }: LoginProps) {
+    const session = await auth();
+    if (session) {
+        return redirect("/");
+    }
+
     return (
         <div className="flex flex-col justify-center items-center h-screen">
             <LoginForm callbackUrl={searchParams.callbackUrl} error={searchParams.error} />

packages/web/src/auth.ts

@@ -3,12 +3,22 @@ import NextAuth, { DefaultSession } from "next-auth"
 import GitHub from "next-auth/providers/github"
 import Google from "next-auth/providers/google"
 import Credentials from "next-auth/providers/credentials"
+import EmailProvider from "next-auth/providers/nodemailer";
 import { PrismaAdapter } from "@auth/prisma-adapter"
 import { prisma } from "@/prisma";
-import { AUTH_GITHUB_CLIENT_ID, AUTH_GITHUB_CLIENT_SECRET, AUTH_GOOGLE_CLIENT_ID, AUTH_GOOGLE_CLIENT_SECRET, AUTH_LOOPS_KEY, AUTH_LOOPS_TRANSACTIONAL_ID, AUTH_SECRET, AUTH_URL } from "./lib/environment";
+import {
+    AUTH_GITHUB_CLIENT_ID,
+    AUTH_GITHUB_CLIENT_SECRET,
+    AUTH_GOOGLE_CLIENT_ID,
+    AUTH_GOOGLE_CLIENT_SECRET,
+    AUTH_SECRET,
+    AUTH_URL,
+    EMAIL_FROM,
+    SMTP_CONNECTION_URL
+} from "./lib/environment";
 import { User } from '@sourcebot/db';
 import 'next-auth/jwt';
-import type { EmailConfig, EmailUserConfig, Provider } from "next-auth/providers";
+import type { Provider } from "next-auth/providers";
 import { verifyCredentialsRequestSchema, verifyCredentialsResponseSchema } from './lib/schemas';
 
 export const runtime = 'nodejs';
@@ -27,37 +37,6 @@ declare module 'next-auth/jwt' {
     }
 }
 
-function Loops(config: EmailUserConfig & { transactionalId?: string }): EmailConfig {
-    return {
-        id: "loops",
-        type: "email",
-        name: "Loops",
-        from: "[email protected]",
-        maxAge: 24 * 60 * 60,
-        async sendVerificationRequest(params) {
-            const { identifier: to, provider, url } = params;
-            const res = await fetch("https://app.loops.so/api/v1/transactional", {
-                method: "POST",
-                headers: {
-                    Authorization: `Bearer ${provider.apiKey}`,
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                    transactionalId: config.transactionalId,
-                    email: to,
-                    dataVariables: {
-                        url: url,
-                    },
-                }),
-            })
-            if (!res.ok) {
-                throw new Error("Loops Send Error: " + JSON.stringify(await res.json()))
-            }
-        },
-        options: config,
-    }
-}
-
 const providers: Provider[] = [
     GitHub({
         clientId: AUTH_GITHUB_CLIENT_ID,
@@ -67,10 +46,6 @@ const providers: Provider[] = [
         clientId: AUTH_GOOGLE_CLIENT_ID,
         clientSecret: AUTH_GOOGLE_CLIENT_SECRET,
     }),
-    Loops({
-        apiKey: AUTH_LOOPS_KEY,
-        transactionalId: AUTH_LOOPS_TRANSACTIONAL_ID,
-    }),
     Credentials({
         credentials: {
             email: {},
@@ -103,22 +78,16 @@ const providers: Provider[] = [
                 image: user.image,
             }
         }
-    })
+    }),
+    ...(SMTP_CONNECTION_URL && EMAIL_FROM ? [
+        EmailProvider({
+            server: SMTP_CONNECTION_URL,
+            from: EMAIL_FROM,
+            maxAge: 60 * 10,
+        }),
+    ] : []),
 ];
 
-// @see: https://authjs.dev/guides/pages/signin
-export const providerMap = providers
-    .map((provider) => {
-        if (typeof provider === "function") {
-            const providerData = provider()
-            return { id: providerData.id, name: providerData.name }
-        } else {
-            return { id: provider.id, name: provider.name }
-        }
-    })
-    .filter((provider) => provider.id !== "credentials");
-
-
 const useSecureCookies = AUTH_URL?.startsWith("https://") ?? false;
 const hostName = AUTH_URL ? new URL(AUTH_URL).hostname : "localhost";
 

packages/web/src/lib/environment.ts

@@ -13,11 +13,12 @@ export const AUTH_GITHUB_CLIENT_SECRET = getEnv(process.env.AUTH_GITHUB_CLIENT_S
 export const AUTH_GOOGLE_CLIENT_ID = getEnv(process.env.AUTH_GOOGLE_CLIENT_ID);
 export const AUTH_GOOGLE_CLIENT_SECRET = getEnv(process.env.AUTH_GOOGLE_CLIENT_SECRET);
 export const AUTH_URL = getEnv(process.env.AUTH_URL)!;
-export const AUTH_LOOPS_KEY = getEnv(process.env.AUTH_LOOPS_KEY);
-export const AUTH_LOOPS_TRANSACTIONAL_ID = getEnv(process.env.AUTH_LOOPS_TRANSACTIONAL_ID);
 
 export const STRIPE_SECRET_KEY = getEnv(process.env.STRIPE_SECRET_KEY);
 export const STRIPE_PRODUCT_ID = getEnv(process.env.STRIPE_PRODUCT_ID);
 export const STRIPE_WEBHOOK_SECRET = getEnv(process.env.STRIPE_WEBHOOK_SECRET);
 
 export const CONFIG_MAX_REPOS_NO_TOKEN = getEnvNumber(process.env.CONFIG_MAX_REPOS_NO_TOKEN, 500);
+
+export const SMTP_CONNECTION_URL = getEnv(process.env.SMTP_CONNECTION_URL);
+export const EMAIL_FROM = getEnv(process.env.EMAIL_FROM);

packages/web/src/middleware.ts

@@ -1,7 +1,6 @@
-import { NextResponse } from "next/server";
-import { auth } from "./auth"
+import { NextRequest, NextResponse } from "next/server";
 
-export default auth((request) => {
+export async function middleware(request: NextRequest) {
     const host = request.headers.get("host")!;
 
     const searchParams = request.nextUrl.searchParams.toString();
@@ -13,15 +12,12 @@ export default auth((request) => {
         host === process.env.NEXT_PUBLIC_ROOT_DOMAIN ||
         host === 'localhost:3000'
     ) {
-        if (request.nextUrl.pathname === "/login" && request.auth) {
-            return NextResponse.redirect(new URL("/", request.url));
-        }
         return NextResponse.next();
     }
 
     const subdomain = host.split(".")[0];
     return NextResponse.rewrite(new URL(`/${subdomain}${path}`, request.url));
-});
+};
 
 
 export const config = {

yarn.lock

@@ -2528,6 +2528,13 @@
   dependencies:
     undici-types "~6.19.2"
 
+"@types/nodemailer@^6.4.17":
+  version "6.4.17"
+  resolved "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.17.tgz#5c82a42aee16a3dd6ea31446a1bd6a447f1ac1a4"
+  integrity sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==
+  dependencies:
+    "@types/node" "*"
+
 "@types/prop-types@*":
   version "15.7.13"
   resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz"
@@ -5948,6 +5955,11 @@ [email protected]:
   dependencies:
     detect-libc "^2.0.1"
 
+nodemailer@^6.10.0:
+  version "6.10.0"
+  resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz#1f24c9de94ad79c6206f66d132776b6503003912"
+  integrity sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"