@sendhome/common 1.0.278 → 1.0.280

package/build/events/publishers/order-created-event.d.ts

@@ -2,6 +2,12 @@ import { Subjects } from "../subjects/subjects";
 import { OrderStatus } from "../types/order-status";
 import { Category } from "../types/category";
 type QuoteStatus = "requested" | "amended" | "approved" | "rejected" | "expired";
+type ContactSnapshot = {
+    name?: string;
+    email?: string;
+    phone?: string;
+    address?: string;
+};
 export interface OrderCreatedEvent {
     subject: Subjects.OrderCreated;
     data: {
@@ -34,6 +40,9 @@ export interface OrderCreatedEvent {
         delivery_address: string;
         payment_method: "card" | "paypal" | "applePay" | "bankTransfer";
         sender: string;
+        guest_session_id?: string;
+        guest_contact?: ContactSnapshot;
+        recipient_contact?: ContactSnapshot;
         receiver: string;
         module: string;
         company: string;

package/build/events/publishers/order-updated-event.d.ts

@@ -2,6 +2,12 @@ import { Subjects } from "../subjects/subjects";
 import { OrderStatus } from "../types/order-status";
 import { Category } from "../types/category";
 type QuoteStatus = "requested" | "amended" | "approved" | "rejected" | "expired";
+type ContactSnapshot = {
+    name?: string;
+    email?: string;
+    phone?: string;
+    address?: string;
+};
 export interface OrderUpdatedEvent {
     subject: Subjects.OrderUpdated;
     data: {
@@ -34,6 +40,9 @@ export interface OrderUpdatedEvent {
         delivery_address: string;
         payment_method: "card" | "paypal" | "applePay" | "bankTransfer";
         sender: string;
+        guest_session_id?: string;
+        guest_contact?: ContactSnapshot;
+        recipient_contact?: ContactSnapshot;
         receiver: string;
         module: string;
         company: string;

package/build/middlewares/current-user.d.ts

@@ -1,4 +1,4 @@
-import { Request, Response, NextFunction } from 'express';
+import { Request, Response, NextFunction } from "express";
 interface UserPayload {
     id: string;
     sessionId: string;

package/build/middlewares/current-user.js

@@ -5,13 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const currentUser = (req, res, next) => {
+const extractAccessToken = (req) => {
     var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+    const cookieToken = (_a = req.cookies) === null || _a === void 0 ? void 0 : _a.token;
+    if (cookieToken) {
+        return cookieToken;
+    }
+    const authHeader = req.headers.authorization;
+    if (!authHeader) {
+        return null;
+    }
+    const [scheme, token] = authHeader.split(" ");
+    if (!token || (scheme === null || scheme === void 0 ? void 0 : scheme.toLowerCase()) !== "bearer") {
+        return null;
+    }
+    return token;
+};
+const currentUser = (req, res, next) => {
+    const token = extractAccessToken(req);
+    if (!token) {
         return next();
     }
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
+        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY || "EDWIN");
         req.currentUser = payload;
     }
     catch (err) { }

package/build/middlewares/require-auth.js

@@ -15,53 +15,62 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireAuth = void 0;
 const axios_1 = __importDefault(require("axios"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const extractAccessToken = (req) => {
+    var _a;
+    const cookieToken = (_a = req.cookies) === null || _a === void 0 ? void 0 : _a.token;
+    if (cookieToken) {
+        return cookieToken;
+    }
+    const authHeader = req.headers.authorization;
+    if (!authHeader) {
+        return null;
+    }
+    const [scheme, token] = authHeader.split(" ");
+    if (!token || (scheme === null || scheme === void 0 ? void 0 : scheme.toLowerCase()) !== "bearer") {
+        return null;
+    }
+    return token;
+};
 // Middleware to validate user session per device
 const requireAuth = (sessionServiceUrl) => {
     return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        console.log("req.cookies.token", req.cookies.token);
         try {
-            const token = req.cookies.token || ((_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(" ")[1]);
-            console.log("req.headers.authorization", (_b = req.headers.authorization) === null || _b === void 0 ? void 0 : _b.split(" ")[1]);
+            const token = extractAccessToken(req);
             if (!token) {
                 res.status(401).json({ message: "No session token provided" });
                 return;
             }
-            console.log("token", token);
-            const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
-            // process.env.JWT_KEY!
-            );
-            console.log("session service url", `${sessionServiceUrl}/${payload.sessionId}`);
+            const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY || "EDWIN");
             // Call the session service to validate the session
-            const response = yield axios_1.default.get(`${sessionServiceUrl}/${payload.sessionId}`);
-            if (response.status !== 200) {
-                res.status(401).json({ message: "Invalid or expired session" });
-                return;
-            }
-            // Attach user ID to request object
-            req.currentUser = response.data;
+            yield axios_1.default.get(`${sessionServiceUrl}/${payload.sessionId}`, {
+                timeout: 5000,
+            });
+            // Keep the verified JWT payload as the canonical currentUser data.
+            req.currentUser = payload;
             next();
         }
         catch (error) {
-            console.error("Error during session validation:", error);
-            // Check if error is an Axios error (e.g., network failure or service unreachable)
             if (axios_1.default.isAxiosError(error)) {
-                res
-                    .status(500)
-                    .json({
+                if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 || ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 404) {
+                    res.status(401).json({ message: "Invalid or expired session" });
+                    return;
+                }
+                res.status(500).json({
                     message: "Error connecting to session service",
                     error: error.message,
                 });
             }
             else if (error.name === "JsonWebTokenError") {
-                res
-                    .status(401)
-                    .json({ message: "Invalid JWT token", error: error.message });
+                res.status(401).json({ message: "Invalid access token" });
+            }
+            else if (error.name === "TokenExpiredError") {
+                res.status(401).json({ message: "Access token expired" });
             }
             else {
                 res
                     .status(500)
-                    .json({ message: "Server error during session validation", error });
+                    .json({ message: "Server error during session validation" });
             }
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendhome/common",
-  "version": "1.0.278",
+  "version": "1.0.280",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",