propro-utils 1.3.11 → 1.3.13

package/package.json

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

package/src/server/index.js

@@ -18,30 +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) {
         console.log("verifying access token", token);
-        const verifiedToken = await verifyJWT(token, secret);
+        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 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",

package/src/server/middleware/verifyToken.js

@@ -22,7 +22,7 @@ async function verifyJWT(token, secret= "thisisasamplesecret") {
 
 async function callTokenEndpoint(token) {
   try {
-    const response = await axios.post('http://auth:8182/tokens', {
+    const response = await axios.post(`${process.env.AUTH_URL}/api/v1/tokens`, {
       refreshToken: token,
     });
     return response.data.tokens ? response.data.tokens.access.token : null;