fix: correct smtp port for local and prod

dandelionn · dandelionn · commit d8c5a7191def · 2025-09-13T18:18:14.000+03:00
diff --git a/.devcontainer/.env.production.local.example b/.devcontainer/.env.production.local.example
@@ -3,6 +3,9 @@ PORT=3000
 FRONTEND_URL=http://localhost:3000
 
 DATABASE_URL=postgresql://admin_pg:password@postgres:5432/express-hybrid-auth-api-local-prod-db
+# Use the Docker service name 'postgres' as the host because the app runs inside a container.
+# Port 5432 is the default PostgreSQL port inside the container.
+# From the host machine (local Node.js), you would connect to localhost:5433 because of the port mapping in docker-compose.yml.
 
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
@@ -14,11 +17,13 @@ GITHUB_CALLBACK_URL=http://localhost:3000/auth/github/callback
 
 NODE_ENV=development
 
-REDIS_PORT=6379 
-REDIS_HOST=redis # using redis service name because the app will run in a container so localhost is not correct
+REDIS_PORT=6379
+REDIS_HOST=redis  # Use the Docker service name 'redis' because the app runs inside a container.
+                  # 'localhost' would point to the container itself, not the Redis container.
 
-SMTP_HOST=smtp4dev
-SMTP_PORT=2525
+SMTP_HOST=smtp4dev  # Docker service name for smtp4dev container
+SMTP_PORT=25        # Container's SMTP port (25). 
+                    # Use port 25 here because inside the container, Docker networking connects directly to smtp4dev's internal port.
 
 SESSION_SECRET="QeWMItONAv+x6AmdOJ2D5O1h/d//DjO5bpmjz6O0AOnxfc7Q4OlHYeXxX2HE6l0N2zEMZTAYmmRc8Z50UAFPHA=="
 ACCESS_TOKEN_SECRET="F9HHTuGGzVhbzB6rMoTLRVlZu7RhsicD6iF00xDn5K4UIlHtkcecz1bMyDRaewfjTUqmoTH6UWN22Bf7qymGBg=="
diff --git a/.devcontainer/docker-compose.dev.yml b/.devcontainer/docker-compose.dev.yml
@@ -43,7 +43,7 @@ services:
         image: rnwood/smtp4dev
         ports:
             - '5000:80' # Web UI
-            - '2525:2525' # SMTP server
+            - '2525:25' # SMTP server (Host 2525 -> Container 25 (SMTP))
         restart: unless-stopped
         environment:
             - Logging__LogLevel__Default=Information
diff --git a/.devcontainer/docker-compose.prod.yml b/.devcontainer/docker-compose.prod.yml
@@ -64,7 +64,7 @@ services:
         image: rnwood/smtp4dev
         ports:
             - '5000:80'
-            - '2525:2525'
+            - '2525:25' # SMTP server (Host 2525 -> Container 25 (SMTP))
         restart: unless-stopped
         environment:
             - Logging__LogLevel__Default=Information
diff --git a/.env.development b/.env.development
@@ -1,4 +1,4 @@
-PORT=3001
+PORT=3000
 FRONTEND_URL=http://localhost:3000
 
 DEBUG_LOG=true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode"
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "esbenp.prettier-vscode"
 }
diff --git a/badges/coverage.svg b/badges/coverage.svg
@@ -1,20 +1,20 @@
-<svg width="107.3" height="20" viewBox="0 0 1073 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="coverage: 93.9%">
-  <title>coverage: 93.9%</title>
-  <linearGradient id="edPuj" x2="0" y2="100%">
+<svg width="114.3" height="20" viewBox="0 0 1143 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="coverage: 93.71%">
+  <title>coverage: 93.71%</title>
+  <linearGradient id="LaSvB" x2="0" y2="100%">
     <stop offset="0" stop-opacity=".1" stop-color="#EEE"/>
     <stop offset="1" stop-opacity=".1"/>
   </linearGradient>
-  <mask id="upFgM"><rect width="1073" height="200" rx="30" fill="#FFF"/></mask>
-  <g mask="url(#upFgM)">
+  <mask id="RupZf"><rect width="1143" height="200" rx="30" fill="#FFF"/></mask>
+  <g mask="url(#RupZf)">
     <rect width="603" height="200" fill="#555"/>
-    <rect width="470" height="200" fill="#97c40f" x="603"/>
-    <rect width="1073" height="200" fill="url(#edPuj)"/>
+    <rect width="540" height="200" fill="#97c40f" x="603"/>
+    <rect width="1143" height="200" fill="url(#LaSvB)"/>
   </g>
   <g aria-hidden="true" fill="#fff" text-anchor="start" font-family="Verdana,DejaVu Sans,sans-serif" font-size="110">
     <text x="60" y="148" textLength="503" fill="#000" opacity="0.25">coverage</text>
     <text x="50" y="138" textLength="503">coverage</text>
-    <text x="658" y="148" textLength="370" fill="#000" opacity="0.25">93.9%</text>
-    <text x="648" y="138" textLength="370">93.9%</text>
+    <text x="658" y="148" textLength="440" fill="#000" opacity="0.25">93.71%</text>
+    <text x="648" y="138" textLength="440">93.71%</text>
   </g>
   
 </svg>
diff --git a/manual-route-tests/2fa-confirm-recover.http b/manual-route-tests/2fa-confirm-recover.http
@@ -1,7 +1,9 @@
 
+@port = 3000
+
 ### Valid token
 
-POST http://localhost:3000/2fa/confirm-recover
+POST http://localhost:{{port}}/2fa/confirm-recover
 content-type: application/json
 
 {
@@ -11,7 +13,7 @@ content-type: application/json
 
 ### Used token
 
-POST http://localhost:3000/2fa/confirm-recover
+POST http://localhost:{{port}}/2fa/confirm-recover
 content-type: application/json
 
 {
@@ -21,7 +23,7 @@ content-type: application/json
 
 ### Expired token
 
-POST http://localhost:3000/2fa/confirm-recover
+POST http://localhost:{{port}}/2fa/confirm-recover
 content-type: application/json
 
 {
@@ -30,7 +32,7 @@ content-type: application/json
 
 ### Not found token
 
-POST http://localhost:3000/2fa/confirm-recover
+POST http://localhost:{{port}}/2fa/confirm-recover
 content-type: application/json
 
 {
diff --git a/manual-route-tests/login.http b/manual-route-tests/login.http
@@ -1,9 +1,11 @@
+@port = 3000
+
 ### Valid credentials
-GET http://localhost:3000/csrf/token
+GET http://localhost:{{port}}/csrf/token
 content-type: application/json
 
 ### Valid credentials
-POST http://localhost:3000/auth/login
+POST http://localhost:{{port}}/auth/login
 x-csrf-token: 170691e9ce54052ddca950de19347c36006d47dd9ad66ba8f8e5504d896a336c159877eaa22b3296fada395791765f6225fc1b667125c85f1555a5f4509c2465760793bf49e194256f03738f426a861c27c7f060bd58378159de3df3454dbab6ffc38fe15e10b730c9439aef90ba1a1b5c5f68636d54488498301053f21ee8f2
 content-type: application/json
 
@@ -13,7 +15,7 @@ content-type: application/json
 }
 
 #### Invalid email
-POST http://localhost:3000/auth/login
+POST http://localhost:{{port}}/auth/login
 content-type: application/json
 
 {
@@ -23,7 +25,7 @@ content-type: application/json
 
 
 #### Invalid password
-POST http://localhost:3000/auth/login
+POST http://localhost:{{port}}/auth/login
 content-type: application/json
 
 {
@@ -33,7 +35,7 @@ content-type: application/json
 
 
 #### Invalid password
-POST http://localhost:3000/auth/login
+POST http://localhost:{{port}}/auth/login
 content-type: application/json
 
 {
diff --git a/manual-route-tests/signup.http b/manual-route-tests/signup.http
@@ -1,6 +1,8 @@
 
+@port = 3000
+
 ### Good password
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -12,7 +14,7 @@ content-type: application/json
 }
 
 ### Password must contain at least one digit
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -24,7 +26,7 @@ content-type: application/json
 }
 
 ### Password must contain at most 100 characters
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -36,7 +38,7 @@ content-type: application/json
 }
 
 ### Password must contain at least 8 characters
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -48,7 +50,7 @@ content-type: application/json
 }
 
 ### Password must contain at least one special character
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -60,7 +62,7 @@ content-type: application/json
 }
 
 ### First name must be at least 1 character
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -72,7 +74,7 @@ content-type: application/json
 }
 
 ### First name must be at most 30 characters
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -84,7 +86,7 @@ content-type: application/json
 }
 
 ### Last name must be at least 1 characters
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -96,7 +98,7 @@ content-type: application/json
 }
 
 ### Last name must be at most 30 characters
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -108,7 +110,7 @@ content-type: application/json
 }
 
 ### Invalid email address
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
@@ -120,7 +122,7 @@ content-type: application/json
 }
 
 ### Invalid role
-POST http://localhost:3000/auth/signup
+POST http://localhost:{{port}}/auth/signup
 content-type: application/json
 
 {
diff --git a/manual-route-tests/verify-signup.http b/manual-route-tests/verify-signup.http
@@ -1,7 +1,9 @@
 
+@port = 3000
+
 ### Valid token
 
-POST http://localhost:3000/auth/verify-signup
+POST http://localhost:{{port}}/auth/verify-signup
 content-type: application/json
 
 {
@@ -11,7 +13,7 @@ content-type: application/json
 
 ### Used token
 
-POST http://localhost:3000/auth/verify-signup
+POST http://localhost:{{port}}/auth/verify-signup
 content-type: application/json
 
 {
@@ -21,7 +23,7 @@ content-type: application/json
 
 ### Expired token
 
-POST http://localhost:3000/auth/verify-signup
+POST http://localhost:{{port}}/auth/verify-signup
 content-type: application/json
 
 {
@@ -30,7 +32,7 @@ content-type: application/json
 
 ### Not found token
 
-POST http://localhost:3000/auth/verify-signup
+POST http://localhost:{{port}}/auth/verify-signup
 content-type: application/json
 
 {
diff --git a/src/lib/mailer.tsx b/src/lib/mailer.tsx
@@ -7,6 +7,7 @@ import TwoFactorDisabledEmail from '../../emails/templates/2fa-disabled-email.js
 import PasswordResetEmail from '../../emails/templates/password-reset-email.js';
 import GlobalConfig from '../config.js';
 import { transporter } from './mail-transporter.js';
+import logger from './logger/logger.js';
 
 export async function sendVerificationEmail({
 	token,
@@ -19,6 +20,7 @@ export async function sendVerificationEmail({
 	expiresInMinutes: number;
 	t: (key: string, options?: any) => string;
 }) {
+	console.log('I am here');
 	const emailHtml = await render(
 		<VerificationEmail
 			verificationUrl={`${GlobalConfig.EMAIL_FRONTEND_BASE_URL}/verify?token=${token}`}
@@ -36,7 +38,14 @@ export async function sendVerificationEmail({
 		html: emailHtml,
 	};
 
-	await transporter.sendMail(options);
+	try {
+		console.log('I am here');
+		await transporter.sendMail(options);
+	} catch (error) {
+		console.log('error', error);
+		logger.error('Failed to send verification email', { error, userEmail });
+		throw error;
+	}
 }
 
 export async function sendAccountActivationEmail({
diff --git a/src/middlewares/error-handler.ts b/src/middlewares/error-handler.ts
@@ -1,6 +1,5 @@
 import type { ErrorRequestHandler } from 'express';
 import { createMessageResponse } from '../lib/response.js';
-import logger from '@/lib/logger/index.js';
 import { AppStatusCode } from '@/@types/status-code.js';
 
 // Underscore prefix (_) marks parameters as intentionally unused
@@ -12,20 +11,6 @@ export const errorHandler: ErrorRequestHandler = (error, request, response, _nex
 		return;
 	}
 
-	// Enhanced error logging for debugging
-	logger.error({
-		message: 'Global error handler caught error',
-		err: error, // This will use the enhanced err serializer
-		request: {
-			method: request.method,
-			url: request.url,
-			headers: {
-				'user-agent': request.headers['user-agent'],
-				'content-type': request.headers['content-type'],
-			},
-		},
-	});
-
 	response
 		.status(error.status || 500)
 		.json(createMessageResponse(error.message || request.t('errors.internal'), 'error'));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PORT=3001`
	`1`	`+PORT=3000`
`2`	`2`	`FRONTEND_URL=http://localhost:3000`
`3`	`3`
`4`	`4`	`DEBUG_LOG=true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "editor.formatOnSave": true,`
`3`		`- "editor.defaultFormatter": "esbenp.prettier-vscode"`
	`2`	`+ "editor.formatOnSave": true,`
	`3`	`+ "editor.defaultFormatter": "esbenp.prettier-vscode"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`
	`2`	`+@port = 3000`
	`3`	`+`
`2`	`4`	`### Valid token`
`3`	`5`
`4`		`-POST http://localhost:3000/2fa/confirm-recover`
	`6`	`+POST http://localhost:{{port}}/2fa/confirm-recover`
`5`	`7`	`content-type: application/json`
`6`	`8`
`7`	`9`	`{`
`@@ -11,7 +13,7 @@ content-type: application/json`
`11`	`13`
`12`	`14`	`### Used token`
`13`	`15`
`14`		`-POST http://localhost:3000/2fa/confirm-recover`
	`16`	`+POST http://localhost:{{port}}/2fa/confirm-recover`
`15`	`17`	`content-type: application/json`
`16`	`18`
`17`	`19`	`{`
`@@ -21,7 +23,7 @@ content-type: application/json`
`21`	`23`
`22`	`24`	`### Expired token`
`23`	`25`
`24`		`-POST http://localhost:3000/2fa/confirm-recover`
	`26`	`+POST http://localhost:{{port}}/2fa/confirm-recover`
`25`	`27`	`content-type: application/json`
`26`	`28`
`27`	`29`	`{`
`@@ -30,7 +32,7 @@ content-type: application/json`
`30`	`32`
`31`	`33`	`### Not found token`
`32`	`34`
`33`		`-POST http://localhost:3000/2fa/confirm-recover`
	`35`	`+POST http://localhost:{{port}}/2fa/confirm-recover`
`34`	`36`	`content-type: application/json`
`35`	`37`
`36`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`
	`2`	`+@port = 3000`
	`3`	`+`
`2`	`4`	`### Good password`
`3`		`-POST http://localhost:3000/auth/signup`
	`5`	`+POST http://localhost:{{port}}/auth/signup`
`4`	`6`	`content-type: application/json`
`5`	`7`
`6`	`8`	`{`
`@@ -12,7 +14,7 @@ content-type: application/json`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`### Password must contain at least one digit`
`15`		`-POST http://localhost:3000/auth/signup`
	`17`	`+POST http://localhost:{{port}}/auth/signup`
`16`	`18`	`content-type: application/json`
`17`	`19`
`18`	`20`	`{`
`@@ -24,7 +26,7 @@ content-type: application/json`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`### Password must contain at most 100 characters`
`27`		`-POST http://localhost:3000/auth/signup`
	`29`	`+POST http://localhost:{{port}}/auth/signup`
`28`	`30`	`content-type: application/json`
`29`	`31`
`30`	`32`	`{`
`@@ -36,7 +38,7 @@ content-type: application/json`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`### Password must contain at least 8 characters`
`39`		`-POST http://localhost:3000/auth/signup`
	`41`	`+POST http://localhost:{{port}}/auth/signup`
`40`	`42`	`content-type: application/json`
`41`	`43`
`42`	`44`	`{`
`@@ -48,7 +50,7 @@ content-type: application/json`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`### Password must contain at least one special character`
`51`		`-POST http://localhost:3000/auth/signup`
	`53`	`+POST http://localhost:{{port}}/auth/signup`
`52`	`54`	`content-type: application/json`
`53`	`55`
`54`	`56`	`{`
`@@ -60,7 +62,7 @@ content-type: application/json`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`### First name must be at least 1 character`
`63`		`-POST http://localhost:3000/auth/signup`
	`65`	`+POST http://localhost:{{port}}/auth/signup`
`64`	`66`	`content-type: application/json`
`65`	`67`
`66`	`68`	`{`
`@@ -72,7 +74,7 @@ content-type: application/json`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`### First name must be at most 30 characters`
`75`		`-POST http://localhost:3000/auth/signup`
	`77`	`+POST http://localhost:{{port}}/auth/signup`
`76`	`78`	`content-type: application/json`
`77`	`79`
`78`	`80`	`{`
`@@ -84,7 +86,7 @@ content-type: application/json`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`### Last name must be at least 1 characters`
`87`		`-POST http://localhost:3000/auth/signup`
	`89`	`+POST http://localhost:{{port}}/auth/signup`
`88`	`90`	`content-type: application/json`
`89`	`91`
`90`	`92`	`{`
`@@ -96,7 +98,7 @@ content-type: application/json`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`### Last name must be at most 30 characters`
`99`		`-POST http://localhost:3000/auth/signup`
	`101`	`+POST http://localhost:{{port}}/auth/signup`
`100`	`102`	`content-type: application/json`
`101`	`103`
`102`	`104`	`{`
`@@ -108,7 +110,7 @@ content-type: application/json`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`### Invalid email address`
`111`		`-POST http://localhost:3000/auth/signup`
	`113`	`+POST http://localhost:{{port}}/auth/signup`
`112`	`114`	`content-type: application/json`
`113`	`115`
`114`	`116`	`{`
`@@ -120,7 +122,7 @@ content-type: application/json`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`### Invalid role`
`123`		`-POST http://localhost:3000/auth/signup`
	`125`	`+POST http://localhost:{{port}}/auth/signup`
`124`	`126`	`content-type: application/json`
`125`	`127`
`126`	`128`	`{`