diff --git a/.env.example b/.env.example index d8e1e8ab..2e6a1161 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,10 @@ POSTGRES_URL= EMAIL_FROM= -EMAIL_URL= -EMAIL_TOKEN= +SMTP_HOST= +SMTP_PORT= +SMTP_USER= +SMTP_PASSWORD= NEXT_PUBLIC_BASE_URL= NEXT_PUBLIC_STORAGE_URL= diff --git a/README.md b/README.md index 805e32f6..f9db4b0e 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,10 @@ pnpm dev | -------------------------------- | ----------------------------- | ---------------- | --------------------------------------------- | | `POSTGRES_URL` | PostgreSQL connection URL | Yes | `postgres://user:pass@localhost:5432/db` | | `EMAIL_FROM` | Sender email address | Yes | `"Kan "` | -| `EMAIL_URL` | Email service API URL | Yes | `https://api.resend.com/emails` | -| `EMAIL_TOKEN` | Email service API token | Yes | `re_xxxx` | +| `SMTP_HOST` | SMTP server hostname | Yes | `smtp.resend.com` | +| `SMTP_PORT` | SMTP server port | Yes | `465` | +| `SMTP_USER` | SMTP username/email | Yes | `resend` | +| `SMTP_PASSWORD` | SMTP password/token | Yes | `re_xxxx` | | `NEXT_PUBLIC_BASE_URL` | Base URL of your installation | Yes | `http://localhost:3000` | | `BETTER_AUTH_SECRET` | Auth encryption secret | Yes | Random 32+ char string | | `BETTER_AUTH_URL` | Auth callback URL | Yes | Same as `NEXT_PUBLIC_BASE_URL` | diff --git a/apps/web/src/components/AuthForm.tsx b/apps/web/src/components/AuthForm.tsx index 3b51b2b3..f53db80c 100644 --- a/apps/web/src/components/AuthForm.tsx +++ b/apps/web/src/components/AuthForm.tsx @@ -4,7 +4,7 @@ import { useForm } from "react-hook-form"; import { FaGoogle } from "react-icons/fa"; import { z } from "zod"; -import { authClient } from "@kan/auth"; +import { authClient } from "@kan/auth/client"; import Button from "~/components/Button"; import Input from "~/components/Input"; diff --git a/apps/web/src/components/UserMenu.tsx b/apps/web/src/components/UserMenu.tsx index 5e681b24..b1aa5713 100644 --- a/apps/web/src/components/UserMenu.tsx +++ b/apps/web/src/components/UserMenu.tsx @@ -3,7 +3,7 @@ import { useRouter } from "next/navigation"; import { Menu, Transition } from "@headlessui/react"; import { Fragment } from "react"; -import { authClient } from "@kan/auth"; +import { authClient } from "@kan/auth/client"; import { useTheme } from "~/providers/theme"; import { getAvatarUrl } from "~/utils/helpers"; diff --git a/apps/web/src/pages/api/auth/[...all].ts b/apps/web/src/pages/api/auth/[...all].ts index f62fc73a..7c619619 100644 --- a/apps/web/src/pages/api/auth/[...all].ts +++ b/apps/web/src/pages/api/auth/[...all].ts @@ -1,6 +1,6 @@ import { toNodeHandler } from "better-auth/node"; -import { initAuth } from "@kan/auth"; +import { initAuth } from "@kan/auth/server"; import { createDrizzleClient } from "@kan/db/client"; export const config = { api: { bodyParser: false } }; diff --git a/apps/web/src/views/settings/components/CreateAPIKeyForm.tsx b/apps/web/src/views/settings/components/CreateAPIKeyForm.tsx index 72b86068..2b9fb684 100644 --- a/apps/web/src/views/settings/components/CreateAPIKeyForm.tsx +++ b/apps/web/src/views/settings/components/CreateAPIKeyForm.tsx @@ -1,4 +1,4 @@ -import { authClient } from "@kan/auth"; +import { authClient } from "@kan/auth/client"; import Button from "~/components/Button"; import Input from "~/components/Input"; diff --git a/packages/api/src/routers/member.ts b/packages/api/src/routers/member.ts index 81feada2..73b22b15 100644 --- a/packages/api/src/routers/member.ts +++ b/packages/api/src/routers/member.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { z } from "zod"; -import { authClient } from "@kan/auth"; +import { authClient } from "@kan/auth/client"; import * as memberRepo from "@kan/db/repository/member.repo"; import * as userRepo from "@kan/db/repository/user.repo"; import * as workspaceRepo from "@kan/db/repository/workspace.repo"; diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.ts index a09daa34..3a53eeab 100644 --- a/packages/api/src/trpc.ts +++ b/packages/api/src/trpc.ts @@ -6,7 +6,7 @@ import superjson from "superjson"; import { ZodError } from "zod"; import type { dbClient } from "@kan/db/client"; -import { initAuth } from "@kan/auth"; +import { initAuth } from "@kan/auth/server"; import { createDrizzleClient } from "@kan/db/client"; export interface User { diff --git a/packages/auth/package.json b/packages/auth/package.json index 1e092bc3..92f307d3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -4,7 +4,15 @@ "version": "0.1.0", "type": "module", "exports": { - ".": "./src/index.ts" + ".": "./src/index.ts", + "./client": { + "types": "./src/client.ts", + "default": "./src/client.ts" + }, + "./server": { + "types": "./src/server.ts", + "default": "./src/server.ts" + } }, "license": "GPL-3.0", "scripts": { diff --git a/packages/auth/src/clients.ts b/packages/auth/src/client.ts similarity index 100% rename from packages/auth/src/clients.ts rename to packages/auth/src/client.ts diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts index d1cb6aa5..d9141dfc 100644 --- a/packages/auth/src/index.ts +++ b/packages/auth/src/index.ts @@ -1,6 +1 @@ -import { initAuth } from "./auth"; -import { authClient } from "./clients"; - export const name = "auth"; - -export { initAuth, authClient }; diff --git a/packages/auth/src/server.ts b/packages/auth/src/server.ts new file mode 100644 index 00000000..e008b28f --- /dev/null +++ b/packages/auth/src/server.ts @@ -0,0 +1 @@ +export { initAuth } from "./auth"; diff --git a/packages/email/package.json b/packages/email/package.json index 9bcc6caa..7d6f0054 100644 --- a/packages/email/package.json +++ b/packages/email/package.json @@ -24,12 +24,14 @@ }, "dependencies": { "@react-email/components": "^0.0.25", + "nodemailer": "^7.0.3", "react-email": "^3.0.1" }, "devDependencies": { "@kan/eslint-config": "workspace:*", "@kan/prettier-config": "workspace:*", "@kan/tsconfig": "workspace:*", + "@types/nodemailer": "^6.4.17", "eslint": "catalog:", "prettier": "catalog:", "typescript": "catalog:" diff --git a/packages/email/src/sendEmail.tsx b/packages/email/src/sendEmail.tsx index 2329063a..56d6c145 100644 --- a/packages/email/src/sendEmail.tsx +++ b/packages/email/src/sendEmail.tsx @@ -1,4 +1,5 @@ import { render } from "@react-email/render"; +import nodemailer from "nodemailer"; import JoinWorkspaceTemplate from "./templates/join-workspace"; import MagicLinkTemplate from "./templates/magic-link"; @@ -10,6 +11,16 @@ const emailTemplates: Record = { JOIN_WORKSPACE: JoinWorkspaceTemplate, }; +const transporter = nodemailer.createTransport({ + host: process.env.SMTP_HOST, + port: Number(process.env.SMTP_PORT), + secure: true, + auth: { + user: process.env.SMTP_USER, + pass: process.env.SMTP_PASSWORD, + }, +}); + export const sendEmail = async ( to: string, subject: string, @@ -20,22 +31,17 @@ export const sendEmail = async ( const html = await render(, { pretty: true }); - const response = await fetch(process.env.EMAIL_URL!, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${process.env.EMAIL_TOKEN}`, - }, - body: JSON.stringify({ - from: process.env.EMAIL_FROM, - to, - subject, - html, - }), - }); + const options = { + from: process.env.EMAIL_FROM, + to, + subject, + html, + }; - if (!response.ok) { - throw new Error(`Failed to send email: ${response.statusText}`); + const response = await transporter.sendMail(options); + + if (!response.accepted.length) { + throw new Error(`Failed to send email: ${response.response}`); } return response; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 094e9f7d..ed1bee49 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -370,6 +370,9 @@ importers: '@react-email/components': specifier: ^0.0.25 version: 0.0.25(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + nodemailer: + specifier: ^7.0.3 + version: 7.0.3 react-email: specifier: ^3.0.1 version: 3.0.4(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3) @@ -383,6 +386,9 @@ importers: '@kan/tsconfig': specifier: workspace:* version: link:../../tooling/typescript + '@types/nodemailer': + specifier: ^6.4.17 + version: 6.4.17 eslint: specifier: 'catalog:' version: 9.16.0(jiti@1.21.6) @@ -2342,6 +2348,9 @@ packages: '@types/node@20.17.9': resolution: {integrity: sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==} + '@types/nodemailer@6.4.17': + resolution: {integrity: sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==} + '@types/pg@8.11.6': resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==} @@ -4537,6 +4546,10 @@ packages: node-releases@2.0.19: resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} + nodemailer@7.0.3: + resolution: {integrity: sha512-Ajq6Sz1x7cIK3pN6KesGTah+1gnwMnx5gKl3piQlQQE/PwyJ4Mbc8is2psWYxK3RJTVeqsDaCv8ZzXLCDHMTZw==} + engines: {node: '>=6.0.0'} + nopt@7.2.1: resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -8095,6 +8108,10 @@ snapshots: dependencies: undici-types: 6.19.8 + '@types/nodemailer@6.4.17': + dependencies: + '@types/node': 20.17.9 + '@types/pg@8.11.6': dependencies: '@types/node': 20.17.9 @@ -10759,6 +10776,8 @@ snapshots: node-releases@2.0.19: {} + nodemailer@7.0.3: {} + nopt@7.2.1: dependencies: abbrev: 2.0.0 diff --git a/turbo.json b/turbo.json index 18b0c8c2..aebe178e 100644 --- a/turbo.json +++ b/turbo.json @@ -50,8 +50,10 @@ "GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET", "EMAIL_FROM", - "EMAIL_URL", - "EMAIL_TOKEN", + "SMTP_HOST", + "SMTP_PORT", + "SMTP_USER", + "SMTP_PASSWORD", "NEXT_PUBLIC_KAN_ENV", "STRIPE_SECRET_KEY", "STRIPE_WEBHOOK_SECRET",