fix: ensure smtp metadata logger doesn't crash in tests

.env.example

@@ -74,6 +74,7 @@ AUTH_COOKIE_NAME=mintel_gatekeeper_session
 
 # Sentry / Glitchtip (Error Tracking)
 SENTRY_DSN=
+NEXT_PUBLIC_SENTRY_DSN=
 
 # Gotify (In-App Notifications)
 # GOTIFY_URL=

.gitea/workflows/deploy.yml

@@ -1,4 +1,5 @@
-name: Build & Deploy
+# Infrastructure Maintenance: Production stabilization and email adapter fix triggered on 2026-04-12.
+name: 🚀 Build & Deploy
 
 on:
   push:
@@ -36,13 +37,6 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     steps:
-      - name: 🧹 Maintenance (High Density Cleanup)
-        shell: bash
-        run: |
-          echo "Purging old build layers and dangling images..."
-          docker image prune -f
-          docker builder prune -f --filter "until=6h"
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -187,6 +181,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: 🐳 Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: 🔐 Registry Login
@@ -200,6 +196,8 @@ jobs:
           build-args: |
             NEXT_PUBLIC_BASE_URL=${{ needs.prepare.outputs.next_public_url }}
             NEXT_PUBLIC_TARGET=${{ needs.prepare.outputs.target }}
+            NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
+            UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
             NPM_TOKEN=${{ secrets.REGISTRY_PASS }}
           tags: registry.infra.mintel.me/mintel/mb-grid-solutions:${{ needs.prepare.outputs.image_tag }}
           cache-from: type=registry,ref=registry.infra.mintel.me/mintel/mb-grid-solutions:buildcache
@@ -223,7 +221,7 @@ jobs:
       NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
       
       # Secrets mapping (Database & CMS)
-      PAYLOAD_SECRET:          ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_PAYLOAD_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_PAYLOAD_SECRET) || secrets.PAYLOAD_SECRET || secrets.DIRECTUS_SECRET || vars.PAYLOAD_SECRET || 'you-need-to-set-a-payload-secret' }}
+      PAYLOAD_SECRET:          ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_PAYLOAD_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_PAYLOAD_SECRET) || secrets.PAYLOAD_SECRET || secrets.MINTEL_PRIVATE_TOKEN || secrets.DIRECTUS_SECRET || vars.PAYLOAD_SECRET || 'you-need-to-set-a-payload-secret' }}
       DATABASE_URI:            ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DATABASE_URI) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DATABASE_URI) || secrets.DATABASE_URI || vars.DATABASE_URI }}
       POSTGRES_DB:             ${{ secrets.POSTGRES_DB || vars.POSTGRES_DB || 'payload' }}
       POSTGRES_USER:           ${{ secrets.POSTGRES_USER || vars.POSTGRES_USER || 'directus' }}
@@ -275,12 +273,14 @@ jobs:
           GATEKEEPER_ORIGIN="$NEXT_PUBLIC_BASE_URL/gatekeeper"
 
           # Generate Environment File
+          echo "🔍 Verifying Sentry DSN presence..."
           cat > .env.deploy << EOF
           # Generated by CI - $TARGET
           IMAGE_TAG=$IMAGE_TAG
           NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
           GATEKEEPER_ORIGIN=$GATEKEEPER_ORIGIN
           SENTRY_DSN=$SENTRY_DSN
+          NEXT_PUBLIC_SENTRY_DSN=$SENTRY_DSN
           PROJECT_COLOR=$PROJECT_COLOR
           LOG_LEVEL=$LOG_LEVEL
           
@@ -341,11 +341,24 @@ jobs:
           
           # Apply Payload Migrations using the target app container's programmatic endpoint
           ssh root@alpha.mintel.me "cd $SITE_DIR && echo '→ Waiting for DB and Running Payload Migrations...' && \
-            for i in {1..5}; do \
+            for i in {1..15}; do \
               echo \"Attempt \$i...\"; \
-              docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' exec -T mb-grid-app sh -c 'curl -s -f -X POST -H \"Authorization: Bearer \$PAYLOAD_SECRET\" http://localhost:3000/api/payload/migrate \
+              docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' exec -T mb-grid-app sh -c 'curl -s -i -X POST -H \"Authorization: Bearer \$PAYLOAD_SECRET\" http://localhost:3000/api/payload/migrate' > /tmp/migrate_res 2>&1; \
-                || { echo \"HTTP error or DB not ready.\"; exit 1; }' && { echo '✅ Migrations successful!'; break; } \
+              if grep -q \"200 OK\" /tmp/migrate_res; then \
-              || { if [ \$i -eq 5 ]; then echo '❌ Migration failed after 5 attempts!'; exit 1; else echo '⏳ Retrying in 5s...'; sleep 5; fi; }; \
+                echo \"✅ Migrations successful!\"; \
+                cat /tmp/migrate_res; \
+                break; \
+              else \
+                echo \"❌ Attempt \$i failed. Response:\"; \
+                cat /tmp/migrate_res; \
+                if [ \$i -eq 15 ]; then \
+                  echo \"❌ Migration failed after 15 attempts! Dumping app logs...\"; \
+                  docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' logs --tail 100 mb-grid-app; \
+                  exit 1; \
+                fi; \
+                echo \"⏳ Retrying in 5s...\"; \
+                sleep 5; \
+              fi; \
             done"
           
           ssh root@alpha.mintel.me "docker system prune -f --filter 'until=24h'"

app/[locale]/agb/page.tsx

@@ -74,7 +74,7 @@ export default function AGB() {
               <p className="text-slate-500 font-medium">{stand}</p>
             </div>
             <a
-              href="/assets/AGB MB Grid 1-2026.pdf"
+              href="/assets/AGB MB Grid 3-2026.pdf"
               download
               className="btn-primary !py-3 !px-6 flex items-center gap-2"
             >
@@ -91,7 +91,24 @@ export default function AGB() {
                 </h2>
                 <div className="space-y-4">
                   {section.content.map((paragraph, pIndex) => (
-                    <p key={pIndex}>{paragraph}</p>
+                    <p key={pIndex}>
+                      {paragraph.split(/(\[.*?\]\(.*?\))/g).map((part, i) => {
+                        const match = part.match(/\[(.*?)\]\((.*?)\)/);
+                        if (match) {
+                          return (
+                            <a
+                              key={i}
+                              href={match[2]}
+                              className="text-primary hover:underline font-medium"
+                              download={match[2].endsWith(".pdf")}
+                            >
+                              {match[1]}
+                            </a>
+                          );
+                        }
+                        return part;
+                      })}
+                    </p>
                   ))}
                 </div>
               </div>

app/api/contact/route.ts

@@ -8,6 +8,7 @@ import {
   ConfirmationMessage,
 } from "@mintel/mail";
 import React from "react";
+import nodemailer from "nodemailer";
 
 export async function POST(req: Request) {
   const services = getServerAppServices();
@@ -77,11 +78,33 @@ export async function POST(req: Request) {
       services.errors.captureException(payloadError, { phase: "payload_save" });
     }
 
-    // 2. Email sending via Payload (which uses configured nodemailer)
+    // 2. Email sending via standalone Nodemailer (bypassing Payload adapter)
     try {
       const { config } = await import("@/lib/config");
       const clientName = "MB Grid Solutions";
 
+      // Robust recipient resolution
+      const recipients = Array.isArray(config.mail.recipients)
+        ? config.mail.recipients.filter(Boolean)
+        : [];
+      
+      const to =
+        recipients.length > 0
+          ? recipients.join(",")
+          : process.env.CONTACT_RECIPIENT || "info@mb-grid-solutions.com";
+
+      logger.info("Instantiating standalone nodemailer transport");
+      const transporter = nodemailer.createTransport({
+        host: config.mail.host,
+        port: config.mail.port,
+        auth: {
+          user: config.mail.user,
+          pass: config.mail.pass,
+        },
+      });
+
+      logger.info("Preparing to send notification email", { to, host: config.mail.host });
+
       // 2a. Notification to MB Grid
       const notificationHtml = await render(
         React.createElement(ContactFormNotification, {
@@ -92,19 +115,23 @@ export async function POST(req: Request) {
         }),
       );
 
-      await payload.sendEmail({
+      try {
+        const info = await transporter.sendMail({
           from: config.mail.from,
-        to:
+          to,
-          config.mail.recipients.join(",") ||
-          process.env.CONTACT_RECIPIENT ||
-          "info@mb-grid-solutions.com",
           replyTo: email,
           subject: `Kontaktanfrage von ${name}`,
           html: notificationHtml,
         });
+        logger.info("Notification email sent successfully", { messageId: info?.messageId });
+      } catch (notifyError) {
+        logger.error("Failed to send notification email", { error: notifyError });
+        throw notifyError; // Re-throw to be caught by the outer SMTP catch
+      }
 
       // 2b. Confirmation to the User
       try {
+        logger.info("Preparing to send confirmation email", { to: email });
         const confirmationHtml = await render(
           React.createElement(ConfirmationMessage, {
             name,
@@ -112,16 +139,17 @@ export async function POST(req: Request) {
           }),
         );
 
-        await payload.sendEmail({
+        const info = await transporter.sendMail({
           from: config.mail.from,
           to: email,
           subject: `Ihre Kontaktanfrage bei ${clientName}`,
           html: confirmationHtml,
         });
+        logger.info("Confirmation email sent successfully", { messageId: info?.messageId });
       } catch (confirmError) {
         logger.warn(
           "Failed to send confirmation email, but notification was sent",
-          { error: confirmError },
+          { error: confirmError instanceof Error ? confirmError.message : String(confirmError) },
         );
       }
 

context/agbs.md

@@ -1,6 +1,5 @@
 Liefer- und Zahlungsbedingungen
-Stand Januar 2026
+Stand März 2026
-
 
 1. Allgemeines
    Diese Liefer- und Zahlungsbedingungen (L&Z) der MB Grid Solutions & Services gelten ausschließlich; entgegenstehende oder von unseren Bedingungen abweichende Bedingungen des Kunden erkennen wir nicht an, es sei denn, wir hätten ausdrücklich schriftlich ihrer Geltung zugestimmt. Unsere L&Z gelten auch dann, wenn wir in Kenntnis entgegenstehender oder von unseren L&Z abweichender Bedingungen des Bestellers die Lieferung an diesen vorbehaltlos ausführen. Unsere L&Z gelten nur gegenüber Unternehmern im Sinn von § 310 Abs. 1 BGB sowie juristischen Personen des öffentlichen Rechts oder öffentlich-rechtliches Sondervermögen.
@@ -74,7 +73,7 @@ Sollte es bei einer Mängelrüge zu unterschiedlichen Meinungen bezüglich des K
     Wir haften unbeschränkt nur für Vorsatz und grobe Fahrlässigkeit sowie für Schäden aus einer Verletzung von Leben, Körper oder Gesundheit, die auf mindestens fahrlässiger Pflichtverletzung unsererseits oder unserer gesetzlichen Vertreter oder Erfüllungsgehilfen beruhen; ebenso haften wir unbeschränkt im Fall von uns übernommenen bzw. abgegebenen Garantien und Zusicherungen, sofern ein davon umfasster Mangel unsere Haftung auslöst sowie im Fall einer Haftung nach dem Produkthaftungsgesetz oder sonstigen Gefährdungshaftungstatbeständen. Im Fall sonstiger schuldhafter Verletzung wesentlicher Vertragspflichten („Kardinalpflichten“) ist unsere verbleibende Haftung auf den vertragstypischen vorhersehbaren Schaden beschränkt. Mangelfolgeschäden sowie entgangener Gewinn schließen wir grundsätzlich aus.
 
 16. Kabeltrommeln
-Unsere Kabel werden auf stabilen Vollholztrommeln geliefert. Auf Wunsch vermitteln wir Ihnen Partner, die diese Trommeln gegen eine Gebühr abholen.
+    Unsere Kabel werden auf stabilen Vollholztrommeln geliefert. Bei Lagerzeiten über 3 Monaten ist zu beachten, dass die Trommel regelmäßig bewegt wird, um eine einseitige Belastung zu vermeiden. Folgeschäden bei Nichtbeachtung wie Instabilität schließen wir aus. Zusätzlich die [PDF zum Download](/assets/AGB MB Grid 3-2026.pdf). Auf Wunsch vermitteln wir Ihnen Partner, die diese Trommeln gegen eine Gebühr abholen.
 
 17. Technische Beratungsdienstleistungen
     Die technische Unterstützung ersetzt weder die Fachplanung noch die Ausführungs- oder Prüfverantwortung des beauftragten Ingenieurbüros, Planers oder der ausführenden Fachfirma bzw. verantwortlichen Abteilung.

docker-compose.yaml

@@ -20,7 +20,7 @@ services:
       - "traefik.docker.network=infra"
 
       # Public Router – paths that bypass Gatekeeper auth
-      - "traefik.http.routers.${PROJECT_NAME:-mb-grid}-public.rule=Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`) && PathRegexp(`^/([a-z]{2}/)?(health|login|gatekeeper|uploads|media|robots\\.txt|manifest\\.webmanifest|sitemap(-[0-9]+)?\\.xml|(.*/)?api/og(/.*)?|(.*/)?opengraph-image.*)`)"
+      - "traefik.http.routers.${PROJECT_NAME:-mb-grid}-public.rule=Host(`${TRAEFIK_HOST:-mb-grid-solutions.localhost}`) && PathRegexp(`^/([a-z]{2}/)?(health|login|gatekeeper|uploads|media|robots\\.txt|manifest\\.webmanifest|sitemap(-[0-9]+)?\\.xml|(.*/)?api/og(/.*)?|(.*/)?opengraph-image.*|stats(/.*)?|errors(/.*)?)`)"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid}-public.entrypoints=websecure"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid}-public.tls.certresolver=le"
       - "traefik.http.routers.${PROJECT_NAME:-mb-grid}-public.tls=true"

instrumentation.ts

@@ -0,0 +1,10 @@
+
+export async function register() {
+  if (process.env.NEXT_RUNTIME === 'nodejs') {
+    await import('./sentry.server.config');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    await import('./sentry.edge.config');
+  }
+}

lib/config.ts

@@ -37,8 +37,8 @@ function createConfig() {
 
     errors: {
       glitchtip: {
-        // Use SENTRY_DSN for both server and client (proxied)
+        // Use NEXT_PUBLIC_SENTRY_DSN if available (required for browser-side SDK)
-        dsn: env.SENTRY_DSN,
+        dsn: env.NEXT_PUBLIC_SENTRY_DSN || env.SENTRY_DSN,
         // The proxied origin used in the frontend
         proxyPath: "/errors",
         enabled: Boolean(env.SENTRY_DSN),

lib/env.ts

@@ -17,6 +17,8 @@ import {
 const envExtension = {
   // Project specific overrides or additions
   AUTH_COOKIE_NAME: z.string().default("mb_gatekeeper_session"),
+  NEXT_PUBLIC_SENTRY_DSN: z.string().optional(),
+  SENTRY_DSN: z.string().optional(),
 };
 
 /**

middleware.ts

@@ -1,6 +1,8 @@
+import { NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
 import createMiddleware from "next-intl/middleware";
 
-export default createMiddleware({
+const intlMiddleware = createMiddleware({
   // A list of all locales that are supported
   locales: ["de"],
 
@@ -11,6 +13,17 @@ export default createMiddleware({
   localePrefix: "as-needed",
 });
 
+export default function middleware(request: NextRequest) {
+  const { pathname } = request.nextUrl;
+
+  // Explicit bypass for analytics and error tracking paths
+  if (pathname.startsWith("/stats") || pathname.startsWith("/errors")) {
+    return NextResponse.next();
+  }
+
+  return intlMiddleware(request);
+}
+
 export const config = {
   // Matcher for all pages and internationalized pathnames
   // excluding api, _next, static files, etc.

package.json

@@ -36,7 +36,6 @@
     "@payloadcms/ui": "^3.77.0",
     "@react-email/components": "^1.0.8",
     "@sentry/nextjs": "^10.38.0",
-    "bcrypt": "^6.0.0",
     "bcryptjs": "^3.0.3",
     "framer-motion": "^12.29.2",
     "graphql": "^16.13.0",

pnpm-lock.yaml

@@ -44,9 +44,6 @@ importers:
       '@sentry/nextjs':
         specifier: ^10.38.0
         version: 10.38.0(@opentelemetry/context-async-hooks@2.5.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.0(@opentelemetry/api@1.9.0))(next@16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.77.4))(react@19.2.4)(webpack@5.104.1(esbuild@0.25.12))
-      bcrypt:
-        specifier: ^6.0.0
-        version: 6.0.0
       bcryptjs:
         specifier: ^3.0.3
         version: 3.0.3
@@ -3488,10 +3485,6 @@ packages:
     resolution: {integrity: sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==}
     hasBin: true
 
-  bcrypt@6.0.0:
-    resolution: {integrity: sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==}
-    engines: {node: '>= 18'}
-
   bcryptjs@3.0.3:
     resolution: {integrity: sha512-GlF5wPWnSa/X5LKM1o0wz0suXIINz1iHRLvTS+sLyi7XPbe5ycmYI3DlZqVGZZtDgl4DmasFg7gOB3JYbphV5g==}
     hasBin: true
@@ -5467,10 +5460,6 @@ packages:
   node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
-  node-addon-api@8.6.0:
-    resolution: {integrity: sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==}
-    engines: {node: ^18 || ^20 || >= 21}
-
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -5480,10 +5469,6 @@ packages:
       encoding:
         optional: true
 
-  node-gyp-build@4.8.4:
-    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
-    hasBin: true
-
   node-releases@2.0.27:
     resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
 
@@ -10779,11 +10764,6 @@ snapshots:
 
   baseline-browser-mapping@2.9.19: {}
 
-  bcrypt@6.0.0:
-    dependencies:
-      node-addon-api: 8.6.0
-      node-gyp-build: 4.8.4
-
   bcryptjs@3.0.3: {}
 
   bidi-js@1.0.3:
@@ -11509,8 +11489,8 @@ snapshots:
       '@typescript-eslint/parser': 8.54.0(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.5(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -11526,8 +11506,8 @@ snapshots:
       '@next/eslint-plugin-next': 16.1.6
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.5(eslint@8.57.1)
       eslint-plugin-react-hooks: 7.0.1(eslint@8.57.1)
@@ -11549,7 +11529,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.3
@@ -11560,22 +11540,22 @@ snapshots:
       tinyglobby: 0.2.15
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 8.54.0(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -11586,7 +11566,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.54.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -13015,14 +12995,10 @@ snapshots:
 
   node-addon-api@7.1.1: {}
 
-  node-addon-api@8.6.0: {}
-
   node-fetch@2.7.0:
     dependencies:
       whatwg-url: 5.0.0
 
-  node-gyp-build@4.8.4: {}
-
   node-releases@2.0.27: {}
 
   nodemailer@7.0.12: {}

src/payload/payload.config.ts

@@ -50,24 +50,29 @@ export default buildConfig({
     },
     prodMigrations: migrations,
   }),
-  ...(process.env.SMTP_HOST
-    ? {
   email: nodemailerAdapter({
     defaultFromAddress:
-            process.env.SMTP_FROM || "info@mb-grid-solutions.com",
+      process.env.MAIL_FROM ||
+      process.env.SMTP_FROM ||
+      "info@mb-grid-solutions.com",
     defaultFromName: "MB Grid Solutions CMS",
     transportOptions: {
-            host: process.env.SMTP_HOST,
+      host: process.env.MAIL_HOST || process.env.SMTP_HOST || "localhost",
-            port: parseInt(process.env.SMTP_PORT || "587"),
+      port: parseInt(
+        process.env.MAIL_PORT || process.env.SMTP_PORT || "587",
+      ),
       auth: {
-              user: process.env.SMTP_USER,
+        user:
-              pass: process.env.SMTP_PASS,
+          process.env.MAIL_USERNAME ||
+          process.env.MAIL_USER ||
+          process.env.SMTP_USER,
+        pass: process.env.MAIL_PASSWORD || process.env.SMTP_PASS,
       },
-            secure: process.env.SMTP_SECURE === "true",
+      secure:
+        process.env.MAIL_SECURE === "true" ||
+        process.env.SMTP_SECURE === "true",
     },
   }),
-      }
-    : {}),
   sharp,
   plugins: [
     ...(process.env.S3_ENDPOINT

tests/api-contact.test.ts

@@ -6,6 +6,19 @@ const { mockCreate, mockSendEmail } = vi.hoisted(() => ({
   mockSendEmail: vi.fn(),
 }));
 
+// Mock Nodemailer
+const { mockSendMail } = vi.hoisted(() => ({
+  mockSendMail: vi.fn().mockResolvedValue({ messageId: "mock-message-id" }),
+}));
+
+vi.mock("nodemailer", () => ({
+  default: {
+    createTransport: vi.fn().mockReturnValue({
+      sendMail: mockSendMail,
+    }),
+  },
+}));
+
 vi.mock("payload", () => ({
   getPayload: vi.fn().mockResolvedValue({
     create: mockCreate,
@@ -101,7 +114,7 @@ describe("Contact API Integration", () => {
 
     // But it actually does NOTHING internally
     expect(mockCreate).not.toHaveBeenCalled();
-    expect(mockSendEmail).not.toHaveBeenCalled();
+    expect(mockSendMail).not.toHaveBeenCalled();
   });
 
   it("should successfully save to Payload and send emails", async () => {
@@ -140,10 +153,10 @@ describe("Contact API Integration", () => {
     });
 
     // 2. Verify Email Sending
-    // Note: sendEmail is called twice (Notification + User Confirmation)
+    // Note: sendMail is called twice (Notification + User Confirmation)
-    expect(mockSendEmail).toHaveBeenCalledTimes(2);
+    expect(mockSendMail).toHaveBeenCalledTimes(2);
 
-    expect(mockSendEmail).toHaveBeenNthCalledWith(
+    expect(mockSendMail).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
         subject: "Kontaktanfrage von Jane Doe",
@@ -151,7 +164,7 @@ describe("Contact API Integration", () => {
       }),
     );
 
-    expect(mockSendEmail).toHaveBeenNthCalledWith(
+    expect(mockSendMail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
         to: "jane@example.com",