@misalon/common 1.0.13 → 1.0.16

package/build/index.d.ts

@@ -8,7 +8,6 @@ export * from './middlewares/current-user';
 export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
 export * from './middlewares/validate-request';
-export * from './middlewares/admin-auth';
 export * from './middlewares/restrict-by-role';
 export * from './events/base-listener';
 export * from './events/base-publisher';

package/build/index.js

@@ -24,7 +24,6 @@ __exportStar(require("./middlewares/current-user"), exports);
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/require-auth"), exports);
 __exportStar(require("./middlewares/validate-request"), exports);
-__exportStar(require("./middlewares/admin-auth"), exports);
 __exportStar(require("./middlewares/restrict-by-role"), exports);
 __exportStar(require("./events/base-listener"), exports);
 __exportStar(require("./events/base-publisher"), exports);

package/build/middlewares/current-user.js

@@ -6,15 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
 var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 var currentUser = function (req, res, next) {
-    var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
-        return next();
+    var _a, _b;
+    console.log('Session JWT:', (_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt); // Log the JWT from session
+    if (!((_b = req.session) === null || _b === void 0 ? void 0 : _b.jwt)) {
+        console.log('No JWT in session, skipping user authentication');
+        return next(); // No JWT in session, move to the next middleware
     }
     try {
+        // Log before decoding
+        console.log('Attempting to decode JWT...');
         var payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
-        req.currentUser = payload;
+        console.log('Decoded JWT Payload:', payload); // Log the decoded payload
+        req.currentUser = payload; // Attach user information to request
     }
-    catch (err) { }
-    next();
+    catch (err) {
+        console.error('Error decoding JWT:', err); // Log any decoding errors
+    }
+    next(); // Proceed to the next middleware or route handler
 };
 exports.currentUser = currentUser;

package/build/middlewares/restrict-by-role.js

@@ -5,6 +5,11 @@ exports.restrictByRole = void 0;
 var not_authorized_error_1 = require("../errors/not-authorized-error"); // Adjust path as needed
 var restrictByRole = function (restrictedRoles) {
     return function (req, res, next) {
+        if (!req.currentUser) {
+            // If user is not authenticated, return a 401 error
+            res.status(401).send({ error: 'User not authenticated' });
+            return;
+        }
         if (restrictedRoles.includes(req.currentUser.role)) {
             throw new not_authorized_error_1.NotAuthorizedError();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misalon/common",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [