Merge branch 'main' into feat/docker-image

.env.example

@@ -1,10 +1,8 @@
 POSTGRES_URL=
 
 EMAIL_FROM=
-SMTP_HOST=
+EMAIL_URL=
-SMTP_PORT=
+EMAIL_TOKEN=
-SMTP_USER=
-SMTP_PASSWORD=
 
 NEXT_PUBLIC_BASE_URL=
 NEXT_PUBLIC_STORAGE_URL=

.github/workflows/docker-publish.yml

@@ -1,97 +0,0 @@
-name: Docker
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-on:
-  schedule:
-    - cron: "21 21 * * *"
-  push:
-    branches: ["main"]
-    # Publish semver tags as releases.
-    tags: ["v*.*.*"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: "v2.2.4"
-
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: .
-          file: apps/web/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      # Sign the resulting Docker image digest except on PRs.
-      # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data.  If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
-          TAGS: ${{ steps.meta.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

README.md

@@ -60,13 +60,7 @@ pnpm install
 ```
 
 3. Copy `.env.example` to `.env` and configure your environment variables
-4. Migrate database
+4. Start the development server
-
-```bash
-pnpm db:migrate
-```
-
-5. Start the development server
 
 ```bash
 pnpm dev
@@ -78,10 +72,8 @@ pnpm dev
 | -------------------------------- | ----------------------------- | ---------------- | --------------------------------------------- |
 | `POSTGRES_URL`                   | PostgreSQL connection URL     | Yes              | `postgres://user:pass@localhost:5432/db`      |
 | `EMAIL_FROM`                     | Sender email address          | Yes              | `"Kan <hello@mail.kan.bn>"`                   |
-| `SMTP_HOST`                      | SMTP server hostname          | Yes              | `smtp.resend.com`                             |
+| `EMAIL_URL`                      | Email service API URL         | Yes              | `https://api.resend.com/emails`               |
-| `SMTP_PORT`                      | SMTP server port              | Yes              | `465`                                         |
+| `EMAIL_TOKEN`                    | Email service API token       | Yes              | `re_xxxx`                                     |
-| `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`                |

apps/web/public/__ENV.js

@@ -1 +1,8 @@
-window.__ENV = {"NEXT_PUBLIC_UMAMI_ID":"aaed1f55-25e2-4223-b918-e429c390be35","NEXT_PUBLIC_KAN_ENV":"cloud","NEXT_PUBLIC_BASE_URL":"http://localhost:3000","NEXT_PUBLIC_AVATAR_BUCKET_NAME":"avatars","NEXT_PUBLIC_STORAGE_DOMAIN":"storage.kanbn.com","NEXT_PUBLIC_STORAGE_URL":"https://storage.kanbn.com"};
+window.__ENV = {
+  NEXT_PUBLIC_UMAMI_ID: "aaed1f55-25e2-4223-b918-e429c390be35",
+  NEXT_PUBLIC_KAN_ENV: "cloud",
+  NEXT_PUBLIC_BASE_URL: "http://localhost:3000",
+  NEXT_PUBLIC_AVATAR_BUCKET_NAME: "avatars",
+  NEXT_PUBLIC_STORAGE_DOMAIN: "storage.kanbn.com",
+  NEXT_PUBLIC_STORAGE_URL: "https://storage.kanbn.com",
+};

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/client";
+import { authClient } from "@kan/auth";
 
 import Button from "~/components/Button";
 import Input from "~/components/Input";

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/client";
+import { authClient } from "@kan/auth";
 
 import { useTheme } from "~/providers/theme";
 import { getAvatarUrl } from "~/utils/helpers";

apps/web/src/pages/api/auth/[...all].ts

@@ -1,6 +1,6 @@
 import { toNodeHandler } from "better-auth/node";
 
-import { initAuth } from "@kan/auth/server";
+import { initAuth } from "@kan/auth";
 import { createDrizzleClient } from "@kan/db/client";
 
 export const config = { api: { bodyParser: false } };

apps/web/src/views/settings/components/CreateAPIKeyForm.tsx

@@ -1,4 +1,4 @@
-import { authClient } from "@kan/auth/client";
+import { authClient } from "@kan/auth";
 
 import Button from "~/components/Button";
 import Input from "~/components/Input";

apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx

@@ -1,5 +1,4 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { env } from "next-runtime-env";
 import { useForm } from "react-hook-form";
 import { HiCheck, HiMiniStar } from "react-icons/hi2";
 import { z } from "zod";
@@ -93,9 +92,7 @@ const UpdateWorkspaceUrlForm = ({
   const isWorkspaceSlugAvailable = checkWorkspaceSlugAvailability.data;
 
   const onSubmit = (data: FormValues) => {
-    if (!isWorkspaceSlugAvailable?.isAvailable) return;
+    if (isWorkspaceSlugAvailable?.isAvailable && workspacePlan !== "pro")
-
-    if (workspacePlan !== "pro" && env("NEXT_PUBLIC_KAN_ENV") === "cloud")
       return openModal("UPDATE_WORKSPACE_URL", data.slug);
 
     updateWorkspaceSlug.mutate({
@@ -121,11 +118,7 @@ const UpdateWorkspaceUrlForm = ({
               ? "This workspace username has already been taken"
               : undefined)
           }
-          prefix={
+          prefix="kan.bn/"
-            env("NEXT_PUBLIC_KAN_ENV") === "cloud"
-              ? "kan.bn/"
-              : `${env("NEXT_PUBLIC_BASE_URL")}/`
-          }
           iconRight={
             isWorkspaceSlugAvailable?.isAvailable ||
             (workspacePlan === "pro" && slug === workspaceUrl) ? (

packages/api/src/routers/member.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 
-import { authClient } from "@kan/auth/client";
+import { authClient } from "@kan/auth";
 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";

packages/api/src/routers/workspace.ts

@@ -1,5 +1,4 @@
 import { TRPCError } from "@trpc/server";
-import { env } from "next-runtime-env";
 import { z } from "zod";
 
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
@@ -225,19 +224,10 @@ export const workspaceRouter = createTRPCRouter({
         const isWorkspaceSlugAvailable =
           await workspaceRepo.isWorkspaceSlugAvailable(ctx.db, input.slug);
 
-        if (
-          env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-          workspace.plan !== "pro" &&
-          input.slug !== workspace.publicId
-        ) {
-          throw new TRPCError({
-            message: `Workspace slug cannot be changed in cloud without upgrading to a paid plan`,
-            code: "FORBIDDEN",
-          });
-        }
-
         if (
           reservedOrPremiumWorkspaceSlug?.type === "reserved" ||
+          (workspace.plan !== "pro" &&
+            reservedOrPremiumWorkspaceSlug?.type === "premium") ||
           !isWorkspaceSlugAvailable
         ) {
           throw new TRPCError({

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/server";
+import { initAuth } from "@kan/auth";
 import { createDrizzleClient } from "@kan/db/client";
 
 export interface User {

packages/auth/package.json

@@ -4,15 +4,7 @@
   "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": {

packages/auth/src/index.ts

@@ -1 +1,6 @@
+import { initAuth } from "./auth";
+import { authClient } from "./clients";
+
 export const name = "auth";
+
+export { initAuth, authClient };

packages/auth/src/server.ts

@@ -1 +0,0 @@
-export { initAuth } from "./auth";

packages/email/package.json

@@ -24,14 +24,12 @@
   },
   "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:"

packages/email/src/sendEmail.tsx

@@ -1,5 +1,4 @@
 import { render } from "@react-email/render";
-import nodemailer from "nodemailer";
 
 import JoinWorkspaceTemplate from "./templates/join-workspace";
 import MagicLinkTemplate from "./templates/magic-link";
@@ -11,16 +10,6 @@ const emailTemplates: Record<Templates, React.FC> = {
   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,
@@ -31,17 +20,22 @@ export const sendEmail = async (
 
   const html = await render(<EmailTemplate {...data} />, { pretty: true });
 
-  const options = {
+  const response = await fetch(process.env.EMAIL_URL!, {
-    from: process.env.EMAIL_FROM,
+    method: "POST",
-    to,
+    headers: {
-    subject,
+      "Content-Type": "application/json",
-    html,
+      Authorization: `Bearer ${process.env.EMAIL_TOKEN}`,
-  };
+    },
+    body: JSON.stringify({
+      from: process.env.EMAIL_FROM,
+      to,
+      subject,
+      html,
+    }),
+  });
 
-  const response = await transporter.sendMail(options);
+  if (!response.ok) {
-
+    throw new Error(`Failed to send email: ${response.statusText}`);
-  if (!response.accepted.length) {
-    throw new Error(`Failed to send email: ${response.response}`);
   }
 
   return response;

pnpm-lock.yaml

@@ -370,9 +370,6 @@ 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)
@@ -386,9 +383,6 @@ 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)
@@ -2348,9 +2342,6 @@ 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==}
 
@@ -4546,10 +4537,6 @@ 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}
@@ -8108,10 +8095,6 @@ 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
@@ -10776,8 +10759,6 @@ snapshots:
 
   node-releases@2.0.19: {}
 
-  nodemailer@7.0.3: {}
-
   nopt@7.2.1:
     dependencies:
       abbrev: 2.0.0

turbo.json

@@ -50,10 +50,8 @@
     "GOOGLE_CLIENT_ID",
     "GOOGLE_CLIENT_SECRET",
     "EMAIL_FROM",
-    "SMTP_HOST",
+    "EMAIL_URL",
-    "SMTP_PORT",
+    "EMAIL_TOKEN",
-    "SMTP_USER",
-    "SMTP_PASSWORD",
     "NEXT_PUBLIC_KAN_ENV",
     "STRIPE_SECRET_KEY",
     "STRIPE_WEBHOOK_SECRET",