@sendhome/common 1.0.152 → 1.0.154

package/build/middlewares/require-auth-old.d.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express';
+interface UserPayload {
+    id: string;
+    email: string;
+}
+declare global {
+    namespace Express {
+        interface Request {
+            currentUser?: UserPayload;
+        }
+    }
+}
+export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
+export {};

package/build/middlewares/require-auth-old.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAuth = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const not_authorized_error_1 = require("../errors/not-authorized-error");
+const requireAuth = (req, res, next) => {
+    let token;
+    if (req.headers.authorization &&
+        req.headers.authorization.startsWith("Bearer")) {
+        // Set token from Bearer token in header
+        token = req.headers.authorization.split(" ")[1];
+    }
+    // Make sure token exists
+    if (!token) {
+        throw new not_authorized_error_1.NotAuthorizedError();
+    }
+    try {
+        const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
+        // process.env.JWT_KEY!
+        );
+        req.currentUser = payload;
+    }
+    catch (err) { }
+    next();
+};
+exports.requireAuth = requireAuth;

package/build/middlewares/require-auth.d.ts

@@ -10,5 +10,5 @@ declare global {
         }
     }
 }
-export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
+export declare const requireAuth: (sessionServiceUrl: string, deviceInfo: string) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export {};

package/build/middlewares/require-auth.js

@@ -1,30 +1,48 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireAuth = void 0;
+const axios_1 = __importDefault(require("axios"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const not_authorized_error_1 = require("../errors/not-authorized-error");
-const requireAuth = (req, res, next) => {
-    let token;
-    if (req.headers.authorization &&
-        req.headers.authorization.startsWith("Bearer")) {
-        // Set token from Bearer token in header
-        token = req.headers.authorization.split(" ")[1];
-    }
-    // Make sure token exists
-    if (!token) {
-        throw new not_authorized_error_1.NotAuthorizedError();
-    }
-    try {
-        const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
-        // process.env.JWT_KEY!
-        );
-        req.currentUser = payload;
-        console.log("req.currentUser", req.currentUser);
-    }
-    catch (err) { }
-    next();
+// Middleware to validate user session per device
+const requireAuth = (sessionServiceUrl, deviceInfo) => {
+    return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        try {
+            const token = req.cookies.token || ((_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')[1]);
+            if (!token) {
+                res.status(401).json({ message: 'No session token provided' });
+                return;
+            }
+            const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
+            // process.env.JWT_KEY!
+            );
+            // Call the session service to validate the session
+            const response = yield axios_1.default.get(`${sessionServiceUrl}/${payload.id}`, {
+                params: { device_info: deviceInfo }, // Send the device info for validation
+            });
+            if (response.status !== 200) {
+                res.status(401).json({ message: 'Invalid or expired session' });
+                return;
+            }
+            // Attach user ID to request object
+            req.currentUser = response.data;
+            next();
+        }
+        catch (error) {
+            res.status(500).json({ message: 'Server error during session validation', error });
+        }
+    });
 };
 exports.requireAuth = requireAuth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendhome/common",
-  "version": "1.0.152",
+  "version": "1.0.154",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,6 +24,7 @@
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/mongoose": "^5.11.97",
+    "axios": "^1.7.7",
     "cookie-session": "^2.0.0",
     "express": "^4.17.2",
     "express-validator": "^6.14.0",