propro-utils 1.3.10 → 1.3.12

package/package.json

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

package/src/server/index.js

@@ -4,6 +4,7 @@ const {
   exchangeToken,
   VerifyAccount,
 } = require("./middleware/verifyToken");
+const {refreshTokenMiddleware} = require("./middleware");
 // Main middleware function
 function proproAuthMiddleware(options = {}) {
   const {
@@ -17,28 +18,26 @@ 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 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'];
       }
 
       if (token) {
-        const verifiedToken = verifyJWT(token, secret);
+        console.log("verifying access token", token);
+        const verifiedToken = await verifyJWT(token);
+        console.log("verifiedToken", verifiedToken);
         if (verifiedToken) {
           req.account = verifiedToken;
+          return next();
         } 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) {
-            const newTokenData = await refreshToken(authUrl, refreshToken, clientId, clientSecret);
+            const newTokenData = await refreshTokenMiddleware(req, res, next);
             if (newTokenData) {
-              // Set the new tokens in the cookies
               res.cookie("x-refresh-token", newTokenData.tokens.refresh.token, {
                 httpOnly: true,
                 secure: process.env.NODE_ENV === "production",
@@ -55,6 +54,7 @@ function proproAuthMiddleware(options = {}) {
         }
       } else {
         req.account = undefined;
+        res.status(401).send("Unauthorized: Invalid or expired token");
       }
 
       if (!["/api/auth", "/api/callback"].includes(req.path)) {
@@ -101,7 +101,7 @@ function proproAuthMiddleware(options = {}) {
       }
     } catch (error) {
       console.error("Error in proproAuthMiddleware:", error);
-      res.status(500).send("Internal Server Error");
+      res.status(401).send("Unauthorized: Invalid or expired token");
     }
   };
 }

package/src/server/middleware/verifyToken.js

@@ -8,10 +8,26 @@ const tokenCache = new Map();
  * @param {string} secret - The secret used to sign the JWT.
  * @returns {object|null} - The decoded payload of the JWT if it is valid, or null if it is not valid.
  */
-function verifyJWT(token, secret) {
+async function verifyJWT(token, secret= "thisisasamplesecret") {
   try {
     return jwt.verify(token, secret);
   } catch (err) {
+    if (err.name === 'TokenExpiredError') {
+      const newTokenData = await callTokenEndpoint(token);
+      return newTokenData ? jwt.verify(newTokenData, secret) : null;
+    }
+    return null;
+  }
+}
+
+async function callTokenEndpoint(token) {
+  try {
+    const response = await axios.post('http://auth:8182/tokens', {
+      refreshToken: token,
+    });
+    return response.data.tokens ? response.data.tokens.access.token : null;
+  } catch (error) {
+    console.error('Error during token refresh:', error);
     return null;
   }
 }