propro-utils 1.3.41 → 1.3.43

package/package.json

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

package/src/server/index.js

@@ -8,7 +8,7 @@ const {post} = require("axios");
 /**
  * Middleware for handling authentication and authorization.
  *
- * @param {object} [options={}] - The options for configuring the authentication middleware.
+ * @param {object} [options={}] - The options for configuring the auth entication middleware.
  * @param {string} [options.secret="RESTFULAPIs"] - The secret key used for authentication.
  * @param {string} [options.authUrl=process.env.AUTH_URL] - The authentication URL.
  * @param {string} [options.clientId=process.env.CLIENT_ID] - The client ID.
@@ -41,27 +41,41 @@ function proproAuthMiddleware(options = {}, userSchema) {
                 const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
                     redirectUri
                 )}`;
-                res.status(200).json({redirectUrl});
+                return res.status(200).json({redirectUrl});
             }
 
             if (req.path === "/api/refreshToken") {
+                console.log("refresh token");
                 const refreshToken = req.cookies["x-refresh-token"];
+                console.log("refreshToken", refreshToken);
                 if (!refreshToken) {
                     const authClientUrl = `${clientUrl}/signin`;
                     const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
                         redirectUri
                     )}`;
-                    res.status(401).json({redirectUrl, error: "No refresh token provided"});
+                    return res.status(401).json({redirectUrl, error: "No refresh token provided"});
                 }
 
-                const {accountData, access, refresh} = await post(`${authUrl}/api/v1/auth/refreshTokens`, {
+                const response = await post(`${authUrl}/api/v1/auth/refreshTokens`, {
                     refreshToken
                 }, {
                     params: {
                         actionType: "refresh",
                     }
                 });
+                
+                console.log("response", response.data);
+                console.log("response.data.tokens", response.data.tokens);
 
+                const {account, access, refresh} = response.data;
+
+                console.log("accountData", account);
+                console.log("access", access);
+                console.log("refresh", refresh);
+
+                if (!account || !access || !refresh) {
+                    return res.status(401).json({error: "Invalid or expired refresh token"});
+                }
 
                 const currentDateTime = new Date();