propro-utils 1.3.8 → 1.3.10

package/README.md

@@ -1,6 +1,6 @@
-# propro-auth-middleware
+# propro-utils
 
-`propro-auth-middleware` is a comprehensive Node.js middleware designed for handling both server-side and client-side authentication. It's ideal for applications requiring robust authentication strategies and is highly customizable to fit various authentication needs.
+`propro-utils` is a comprehensive Node.js middleware designed for handling both server-side and client-side authentication, notifcations and other utility functions. It's ideal for applications requiring robust authentication strategies and is highly customizable to fit various authentication needs.
 
 ## Features
 
@@ -15,16 +15,16 @@
 Install the middleware using npm or Yarn:
 
 ````bash
-npm install propro-auth-middleware
+npm install propro-utils
 # or
-yarn add propro-auth-middleware
+yarn add propro-utils
 
 ## Usage
 
 After installing the middleware, you can import it in your project:
 
 ```javascript
-const proproAuthMiddleware = require("propro-auth-middleware");
+const proproAuthMiddleware = require("propro-utils");
 ````
 
 Then, you can use the middleware in your server and client side code:
@@ -32,7 +32,7 @@ Then, you can use the middleware in your server and client side code:
 ```javascript
 const express = require("express");
 const app = express();
-const proproAuthMiddleware = require("propro-auth-middleware");
+const proproAuthMiddleware = require("propro-utils");
 
 // Initialize middleware with default parameters
 app.use(proproAuthMiddleware());
@@ -80,7 +80,7 @@ app.use(
 
 ## Contributing
 
-If you have suggestions for how propro-auth-middleware could be improved, or want to report a bug, open an issue! We'd love all and any contributions.
+If you have suggestions for how propro-utils could be improved, or want to report a bug, open an issue! We'd love all and any contributions.
 
 For more, check out the [Contributing Guide](./CONTRIBUTING.md).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {

package/src/server/index.js

@@ -17,12 +17,13 @@ function proproAuthMiddleware(options = {}) {
   } = options;
 
   return async (req, res, next) => {
+    console.log("req.cookies", req.cookies);
     try {
       // Try to get the token from the Authorization header
       let token;
       if (req.headers.authorization?.startsWith("Bearer ")) {
         token = req.headers.authorization.split(" ")[1];
-      } else {
+      }  else if (req.cookies && req.cookies['x-access-token']) {
         // If not present in Authorization header, try to get it from cookies
         token = req.cookies['x-access-token'];
       }
@@ -31,7 +32,7 @@ function proproAuthMiddleware(options = {}) {
         const verifiedToken = verifyJWT(token, secret);
         if (verifiedToken) {
           req.account = verifiedToken;
-        } else {
+        } else if (req.cookies && req.cookies['x-refresh-token']) {
           // If token is invalid or expired, try to refresh it
           const refreshToken = req.cookies['x-refresh-token'];
           if (refreshToken) {