@hastehaul/common 2.0.31 → 2.0.33

package/build/middlewares/current-user.js

@@ -44,33 +44,28 @@ const jsonwebtoken_1 = __importStar(require("jsonwebtoken"));
  * @returns {Promise<void>} - A Promise that resolves once the user extraction is complete, but it is not used directly.
  */
 const currentUser = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    let result = null;
+    req.currentUser = null;
+    const bearerToken = req.headers.authorization;
+    if (!bearerToken) {
+        return next();
+    }
     try {
-        // Extract the Bearer token from the Authorization header.
-        const bearerToken = req.headers["authorization"];
-        if (typeof bearerToken !== "undefined" && bearerToken) {
-            const token = bearerToken.split(" ")[1];
-            if (token) {
-                // Verify the JWT token and decode the user payload.
-                result = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY.split("-").join(""));
-            }
+        const token = bearerToken.split(' ')[1];
+        if (token) {
+            const result = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY.split('-').join(''));
+            req.currentUser = result;
         }
-        // Attach the user payload to the request object for later use in the application.
-        req.currentUser = result;
     }
     catch (err) {
-        // Handle errors related to token verification or expiration.
         if (err instanceof jsonwebtoken_1.TokenExpiredError) {
             // If the token is expired, you may consider refreshing the token or taking appropriate actions.
             // Uncomment the following line if you want to handle token expiration using the AuthController.
             // await AuthController.refreshToken(req, res);
         }
         else {
-            // If any other error occurs during token verification, set currentUser to null.
-            req.currentUser = null;
+            console.error('Error verifying token:', err);
         }
     }
-    // Call the next middleware in the chain.
     next();
 });
 exports.currentUser = currentUser;

package/build/utils/utils.js

@@ -26,9 +26,11 @@ function generateIdentifier(messageContent) {
 }
 exports.generateIdentifier = generateIdentifier;
 function getValueFromSettings(settings, key, envVar, defaultValue) {
-    const setting = settings.find(item => item.key === key);
-    if (setting)
-        return setting.value;
+    if (settings.length > 0) {
+        const setting = settings.find(item => item.key === key);
+        if (setting)
+            return setting.value;
+    }
     return process.env[envVar] || defaultValue;
 }
 exports.getValueFromSettings = getValueFromSettings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",