Merge branch 'main' into feat/add-pkce-like-session-binding

Author: zhongliang02

.github/workflows/ci.yml

@@ -54,6 +54,10 @@ jobs:
       - name: Setup
         uses: ./tooling/github/setup
 
+      - name: Copy env
+        shell: bash
+        run: cp .env.example .env
+
       - name: Typecheck
         run: pnpm typecheck
 # TODO: Add test CI

apps/web/package.json

@@ -14,6 +14,7 @@
     "with-env": "dotenv -e ../../.env --",
     "test": "vitest",
     "storybook": "CI=1 storybook dev -p 6006",
+    "docker": "docker-compose up",
     "build-storybook": "CI=1 storybook build"
   },
   "dependencies": {

apps/web/src/server/modules/auth/auth.service.ts

@@ -121,14 +121,26 @@ export const emailVerifyOtp = async ({
       })
     }
 
+    // NOTE: You can also use `kysely` for your queries
+    // if you want more fine-grained control.
     // Valid token, delete record to prevent reuse
-    return db.verificationToken.delete({
-      where: {
-        identifier: vfnIdentifier,
-      },
-    })
+    return db.$kysely
+      .deleteFrom('VerificationToken')
+      .where('identifier', '=', vfnIdentifier)
+      .returningAll()
+      .executeTakeFirstOrThrow(
+        // NOTE: If we are unable to find the token,
+        // this means that it has been deleted between
+        // our initial query and the deletion here
+        () =>
+          new TRPCError({
+            code: 'BAD_REQUEST',
+            message:
+              'Token is invalid or has expired. Please request a new OTP.',
+          }),
+      )
   } catch (error) {
-    // see error code here: https://www.prisma.io/docs/reference/api-reference/error-reference#p2025
+    // see error code here: https://www.prisma.io/docs/orm/reference/error-reference#p2025
     if (
       error instanceof Prisma.PrismaClientKnownRequestError &&
       error.code === 'P2025'

apps/web/turbo.json

@@ -6,8 +6,12 @@
       "dependsOn": ["^build"],
       "outputs": [".next/**", "!.next/cache/**", "next-env.d.ts"]
     },
+    "docker": {
+      "cache": false
+    },
     "dev": {
-      "persistent": true
+      "persistent": true,
+      "dependsOn": ["docker"]
     }
   }
 }

apps/web/vercel.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://openapi.vercel.sh/vercel.json",
+  "buildCommand": "turbo vercel-build"
+}

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - POSTGRES_USER=root
       - POSTGRES_PASSWORD=root
     volumes:
-      - postgres-volume:/var/lib/postgresql/data
+      - postgres-volume:/var/lib/postgresql
 
 volumes:
   postgres-volume: