@shadimakhoul/ggcoach 1.0.1 → 1.0.2

package/config/initExpress.ts

@@ -17,8 +17,8 @@ export function initExpress(isDevelopment: boolean) {
   app.use(express.json({ limit: "10mb" }));
   app.use(express.urlencoded({ extended: true, limit: "10mb" }));
 
+  app.use(morgan("dev", { stream } as any));
   if (isDevelopment) {
-    app.use(morgan("dev", { stream } as any));
   } else {
     app.use(morgan("combined", { stream } as any));
   }

package/middleware/auth.ts

@@ -8,46 +8,43 @@ import { JWTPayload } from "../types";
 
 const TOKEN_VERSION_PREFIX = "auth:token-version:";
 
-export const authenticateToken = async (
-  JWT_SECRET: string,
-  req: Request,
-  res: Response,
-  next: NextFunction,
-): Promise<void> => {
-  const authHeader = req.headers["authorization"];
-  const token = authHeader && authHeader.split(" ")[1]; // Bearer TOKEN
+export const authenticateToken = (JWT_SECRET: string) => {
+  return async (req: Request, res: Response, next: NextFunction): Promise<void> => {
+    const authHeader = req.headers["authorization"];
+    const token = authHeader && authHeader.split(" ")[1]; // Bearer TOKEN
 
-  if (!token) {
-    res.status(401).json({
-      success: false,
-      message: "Access token required",
-    });
-    return;
-  }
+    if (!token) {
+      res.status(401).json({
+        success: false,
+        message: "Access token required",
+      });
+      return;
+    }
 
-  try {
-    const decoded = jwt.verify(token, JWT_SECRET, {
-      issuer: "ggcoach-auth-service",
-      audience: "ggcoach-app",
-    }) as JWTPayload;
+    try {
+      const decoded = jwt.verify(token, JWT_SECRET, {
+        issuer: "ggcoach-auth-service",
+        audience: "ggcoach-app",
+      }) as JWTPayload;
 
-    const isValid = await validateTokenWithRedis(decoded);
-    if (!isValid) {
+      const isValid = await validateTokenWithRedis(decoded);
+      if (!isValid) {
+        res.status(403).json({
+          success: false,
+          message: "Invalid or expired token",
+        });
+        return;
+      }
+
+      req.user = decoded;
+      next();
+    } catch (error) {
       res.status(403).json({
         success: false,
         message: "Invalid or expired token",
       });
-      return;
     }
-
-    req.user = decoded;
-    next();
-  } catch (error) {
-    res.status(403).json({
-      success: false,
-      message: "Invalid or expired token",
-    });
-  }
+  };
 };
 
 const validateTokenWithRedis = async (decoded: JWTPayload): Promise<boolean> => {
@@ -70,31 +67,28 @@ const validateTokenWithRedis = async (decoded: JWTPayload): Promise<boolean> =>
   }
 };
 
-export const optionalAuth = async (
-  JWT_SECRET: string,
-  req: Request,
-  _res: Response,
-  next: NextFunction,
-): Promise<void> => {
-  const authHeader = req.headers["authorization"];
-  const token = authHeader && authHeader.split(" ")[1];
+export const optionalAuth = (JWT_SECRET: string) => {
+  return async (req: Request, _res: Response, next: NextFunction): Promise<void> => {
+    const authHeader = req.headers["authorization"];
+    const token = authHeader && authHeader.split(" ")[1];
 
-  if (token) {
-    try {
-      const decoded = jwt.verify(token, JWT_SECRET, {
-        issuer: "ggcoach-auth-service",
-        audience: "ggcoach-app",
-      }) as JWTPayload;
-      const isValid = await validateTokenWithRedis(decoded);
-      if (isValid) {
-        req.user = decoded;
+    if (token) {
+      try {
+        const decoded = jwt.verify(token, JWT_SECRET, {
+          issuer: "ggcoach-auth-service",
+          audience: "ggcoach-app",
+        }) as JWTPayload;
+        const isValid = await validateTokenWithRedis(decoded);
+        if (isValid) {
+          req.user = decoded;
+        }
+      } catch (error) {
+        // Token is invalid, but we continue without user info
+        const err = error instanceof Error ? error : new Error(String(error));
+        logger.warn(`Invalid token in optional auth: ${err.message}`);
       }
-    } catch (error) {
-      // Token is invalid, but we continue without user info
-      const err = error instanceof Error ? error : new Error(String(error));
-      logger.warn(`Invalid token in optional auth: ${err.message}`);
     }
-  }
 
-  next();
+    next();
+  };
 };

package/middleware/errorHandler.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from 'express';
 import { logger } from '../utils';
 
-export const errorHandler = (isDevelopment: boolean, err: any, req: Request, res: Response, next: NextFunction): void => {
+export const errorHandler = (err: any, req: Request, res: Response, next: NextFunction): void => {
   logger.error(`Error: ${err}`);
 
   // Handle specific error types
@@ -54,7 +54,7 @@ export const errorHandler = (isDevelopment: boolean, err: any, req: Request, res
     success: false,
     message: err.message || 'Internal server error',
     code: err.code || 'INTERNAL_ERROR',
-    ...(isDevelopment && { 
+    ...(process.env.NODE_ENV === 'development' && { 
       stack: err.stack,
       requestId: req.headers['x-request-id']
     })

package/middleware/internalAuth.ts

@@ -1,25 +1,27 @@
 import { Request, Response, NextFunction } from 'express';
 
-export const requireInternalToken = (ALLOW_DIRECT_ACCESS: boolean, INTERNAL_SERVICE_TOKEN: string, req: Request, res: Response, next: NextFunction): void => {
-  if (ALLOW_DIRECT_ACCESS) {
-    next();
-    return;
-  }
+export const requireInternalToken = (ALLOW_DIRECT_ACCESS: boolean, INTERNAL_SERVICE_TOKEN: string) => {
+  return (req: Request, res: Response, next: NextFunction): void => {
+    if (ALLOW_DIRECT_ACCESS) {
+      next();
+      return;
+    }
 
-  const token = INTERNAL_SERVICE_TOKEN;
-  if (!token) {
-    // If token isn't set, reject to be safe
-    res.status(403).json({ success: false, message: 'Internal access token not configured' });
-    return;
-  }
+    const token = INTERNAL_SERVICE_TOKEN;
+    if (!token) {
+      // If token isn't set, reject to be safe
+      res.status(403).json({ success: false, message: 'Internal access token not configured' });
+      return;
+    }
 
-  const incoming = (req.headers['x-internal-token'] as string) || '';
-  if (incoming !== token) {
-    res.status(403).json({ success: false, message: 'Forbidden' });
-    return;
-  }
+    const incoming = (req.headers['x-internal-token'] as string) || '';
+    if (incoming !== token) {
+      res.status(403).json({ success: false, message: 'Forbidden' });
+      return;
+    }
 
-  next();
+    next();
+  };
 };
 
 export default requireInternalToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadimakhoul/ggcoach",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Shared utilities and types for GGCoach microservices",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",