propro-utils 1.3.33 → 1.3.35

package/middlewares/account_info.js

@@ -61,7 +61,11 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
 const checkIfUserExists = async (userSchema, accountId) => {
     const user = await userSchema.findOne({ accountId });
     if (!user) {
-        await userSchema.create({accountId});
+        await userSchema.create({
+            accountId,
+            id: uuidv4(),
+            verified: false,
+        });
     }
 };
 

package/package.json

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

package/src/index.js

@@ -21,7 +21,7 @@ let _serverAuth, _clientAuth;
  *     validateUser: async (userId) => {  }, // Function to validate user
  *     onAuthFailRedirect: '/login', // URL to redirect on authentication failure
  *     additionalChecks: async (req) => {  }, // Additional custom checks for requests
- *   }
+ *   },
  * @param {boolean} [options.useClientAuth=false] - A boolean flag to enable client-side authentication.
  * @param {Object} [options.clientOptions={}] - Configuration options for client-side authentication.
  * @param {Schema} [userSchema] - The user schema to perform the operations on.
@@ -39,7 +39,7 @@ let _serverAuth, _clientAuth;
  *     additionalChecks: async (req) => { },
  *   },
  *   useClientAuth: false,
- * }));
+ * }, UserSchema));
  */
 module.exports = function proproAuthMiddleware(options = {}, userSchema) {
   validateEnvironmentVariables([

package/src/server/index.js

@@ -1,8 +1,9 @@
 require("dotenv").config();
 const {
-  exchangeToken,
+    exchangeToken,
 } = require("./middleware/verifyToken");
 const {checkIfUserExists} = require("../../middlewares/account_info");
+const {post} = require("axios");
 
 /**
  * Middleware for handling authentication and authorization.
@@ -19,73 +20,107 @@ const {checkIfUserExists} = require("../../middlewares/account_info");
  * @returns {Function} - Express middleware function.
  */
 function proproAuthMiddleware(options = {}, userSchema) {
-  const {
-    secret = "RESTFULAPIs",
-    authUrl = process.env.AUTH_URL,
-    clientId = process.env.CLIENT_ID,
-    clientSecret = process.env.CLIENT_SECRET,
-    clientUrl = process.env.CLIENT_URL,
-    redirectUri = process.env.REDIRECT_URI,
-    appName = process.env.APP_NAME,
-  } = options;
-
-  return async (req, res, next) => {
-    try {
-      if (!["/api/auth", "/api/callback"].includes(req.path)) {
-        return next();
-      }
-
-      if (req.path === "/api/auth") {
-        const authClientUrl = `${clientUrl}/signin`;
-        const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
-          redirectUri
-        )}`;
-        res.status(200).json({ redirectUrl });
-      }
-
-      if (req.path === "/api/callback") {
-        const code = req.query.code;
-        if (!code) {
-          return res.status(400).send("No code received");
-        }
+    const {
+        secret = "RESTFULAPIs",
+        authUrl = process.env.AUTH_URL,
+        clientId = process.env.CLIENT_ID,
+        clientSecret = process.env.CLIENT_SECRET,
+        clientUrl = process.env.CLIENT_URL,
+        redirectUri = process.env.REDIRECT_URI,
+        appName = process.env.APP_NAME,
+    } = options;
+
+    return async (req, res, next) => {
+        try {
+            if (!["/api/auth", "/api/callback"].includes(req.path)) {
+                return next();
+            }
+
+            if (req.path === "/api/auth") {
+                const authClientUrl = `${clientUrl}/signin`;
+                const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
+                    redirectUri
+                )}`;
+                res.status(200).json({redirectUrl});
+            }
+
+            if (req.path === "/api/refreshToken") {
+                const refreshToken = req.cookies["x-refresh-token"];
+                if (!refreshToken) {
+                    return res.status(401).json({error: "No refresh token provided"});
+                }
+
+                const {accountData, access, refresh} = await post(`${authUrl}/api/v1/auth/refreshTokens`, {
+                    refreshToken
+                }, {
+                    actionType: "refresh",
+                });
+
+
+                const currentDateTime = new Date();
 
-        const {tokens, account, redirectUrl} = await exchangeToken(
-          authUrl,
-          code,
-          clientId,
-          clientSecret,
-          redirectUri
-        );
+                const refreshMaxAge = new Date(refresh.expires).getTime() - currentDateTime.getTime();
 
-        await checkIfUserExists(userSchema, account.accountId);
+                res.cookie("x-refresh-token", refresh.token, {
+                    httpOnly: true,
+                    secure: process.env.NODE_ENV === "production",
+                    maxAge: refreshMaxAge
+                });
 
-        const currentDateTime = new Date();
+                const accessMaxAge = new Date(access.expires).getTime() - currentDateTime.getTime();
 
-        const refreshMaxAge = new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+                res.cookie("x-access-token", access.token, {
+                    httpOnly: true,
+                    secure: process.env.NODE_ENV === "production",
+                    maxAge: accessMaxAge
+                });
 
-        res.cookie("x-refresh-token", tokens.refresh.token, {
-          httpOnly: true,
-          secure: process.env.NODE_ENV === "production",
-          maxAge: refreshMaxAge
-        });
+                return res.status(200).json({message: "Token refreshed successfully"});
+            }
 
-        const accessMaxAge = new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+            if (req.path === "/api/callback") {
+                const code = req.query.code;
+                if (!code) {
+                    return res.status(400).send("No code received");
+                }
 
-        res.cookie("x-access-token", tokens.access.token, {
-          httpOnly: true,
-          secure: process.env.NODE_ENV === "production",
-          maxAge: accessMaxAge
-        });
+                const {tokens, account, redirectUrl} = await exchangeToken(
+                    authUrl,
+                    code,
+                    clientId,
+                    clientSecret,
+                    redirectUri
+                );
 
-        const urlToRedirect = `http://${redirectUrl}/`;
+                await checkIfUserExists(userSchema, account.accountId);
 
-        return res.redirect(urlToRedirect);
-      }
-    } catch (error) {
-      console.error("Error in proproAuthMiddleware:", error);
-      res.status(401).send("Unauthorized: Invalid or expired token");
-    }
-  };
+                const currentDateTime = new Date();
+
+                const refreshMaxAge = new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+
+                res.cookie("x-refresh-token", tokens.refresh.token, {
+                    httpOnly: true,
+                    secure: process.env.NODE_ENV === "production",
+                    maxAge: refreshMaxAge
+                });
+
+                const accessMaxAge = new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+
+                res.cookie("x-access-token", tokens.access.token, {
+                    httpOnly: true,
+                    secure: process.env.NODE_ENV === "production",
+                    maxAge: accessMaxAge
+                });
+
+                const urlToRedirect = `http://${redirectUrl}/`;
+
+                return res.redirect(urlToRedirect);
+            }
+        } catch (error) {
+            console.error("Error in proproAuthMiddleware:", error);
+            res.status(401).send("Unauthorized: Invalid or expired token");
+        }
+    };
 }
 
 module.exports = proproAuthMiddleware;