Fix merge conflicts and add withTransaction helper

- Add withTransaction helper that gracefully handles nested transactions
  (reuses existing transaction in tests, starts new one otherwise)
- Update auth procedures to use withTransaction instead of direct .transaction()
- Add email config to all e2e test contexts (required by merged code)
- Remove duplicate verification token code from signup procedure

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

apps/api-server/src/procedures/auth/forgot-password.ts

@@ -6,6 +6,7 @@
  * This prevents attackers from determining which emails are registered
  */
 
+import { withTransaction } from "@reviq/db";
 import { sendPasswordResetEmail } from "@reviq/emails";
 import { TOKEN_DURATIONS } from "../../utils/cookies.js";
 import {
@@ -37,7 +38,7 @@ export const forgotPassword = os.auth.forgotPassword.handler(
       const expiresAt = generateExpiry(TOKEN_DURATIONS.PASSWORD_RESET);
 
       // Delete old tokens and insert new one in transaction
-      await context.db.transaction().execute(async (trx) => {
+      await withTransaction(context.db, async (trx) => {
         // Delete any existing password reset tokens for this user (security measure)
         await trx
           .deleteFrom("password_resets")