propro-utils 1.4.52 → 1.4.53

package/package.json

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

package/src/index.js

@@ -1,6 +1,6 @@
 const {
   validateEnvironmentVariables,
-} = require("./server/middleware/validateEnv");
+} = require('./server/middleware/validateEnv');
 let _serverAuth, _clientAuth;
 
 /**
@@ -9,7 +9,7 @@ let _serverAuth, _clientAuth;
  * @param {Object} options - Configuration options for the middleware.
  * @param {boolean} [options.useServerAuth=true] - A boolean flag to enable server-side authentication.
  * @param {Object} [options.serverOptions={}] - Configuration options for server-side authentication.
- *   Example:
+ *   ```Example:
  *   {
  *     jwtSecret: 'HubHubJWTSecret', // Secret key for JWT token verification
  *     tokenExpiry: 3600, // Token expiry time in seconds
@@ -22,12 +22,13 @@ let _serverAuth, _clientAuth;
  *     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.
  *
  * @returns {Function} An Express middleware function.
- *
+ * ```
  * Example usage:
  * app.use(proproAuthMiddleware({
  *   useServerAuth: true,
@@ -40,29 +41,31 @@ let _serverAuth, _clientAuth;
  *   },
  *   useClientAuth: false,
  * }, UserSchema));
+ * ```
  */
 module.exports = function proproAuthMiddleware(options = {}, userSchema) {
   validateEnvironmentVariables([
-    "AUTH_URL",
-    "CLIENT_ID",
-    "CLIENT_SECRET",
-    "CLIENT_URL",
-    "REDIRECT_URI",
+    'AUTH_URL',
+    'CLIENT_ID',
+    'CLIENT_SECRET',
+    'CLIENT_URL',
+    'REDIRECT_URI',
   ]);
   return (req, res, next) => {
     try {
       // Lazy loading and initializing server and client authentication modules with options
       if (options.useServerAuth) {
-        _serverAuth = _serverAuth || require("./server")(options.serverOptions, userSchema);
+        _serverAuth =
+          _serverAuth || require('./server')(options.serverOptions, userSchema);
         _serverAuth(req, res, next);
       } else if (options.useClientAuth) {
-        _clientAuth = _clientAuth || require("./client")(options.clientOptions);
+        _clientAuth = _clientAuth || require('./client')(options.clientOptions);
         _clientAuth(req, res, next);
       } else {
         next();
       }
     } catch (error) {
-      console.error("Error in authentication middleware:", error);
+      console.error('Error in authentication middleware:', error);
       next(error);
     }
   };

package/src/server/index.js

@@ -18,6 +18,7 @@ const { post } = require('axios');
  * @param {string} [options.clientUrl=process.env.CLIENT_URL] - The client URL.
  * @param {string} [options.redirectUri=process.env.REDIRECT_URI] - The redirect URI.
  * @param {string} [options.appName=process.env.APP_NAME] - The application name.
+ * @param {string} [options.appUrl] - The URL of the client application.
  * @param {Schema} [userSchema] - The user schema to perform the operations on.
  * @returns {Function} - Express middleware function.
  */
@@ -30,6 +31,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
     clientUrl = process.env.CLIENT_URL,
     redirectUri = process.env.REDIRECT_URI,
     appName = process.env.APP_NAME,
+    appUrl = process.env.APP_URL,
   } = options;
 
   let refreshToken;
@@ -121,7 +123,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
         const user = await checkIfUserExists(userSchema, account.accountId);
 
-        setAuthCookies(res, tokens, account, user, redirectUrl);
+        setAuthCookies(res, tokens, account, user, appUrl);
 
         const urlToRedirect = formatRedirectUrl(redirectUrl);
 

package/src/server/middleware/setAuthCookies.js

@@ -5,9 +5,9 @@
  * @param {Object} tokens - The authentication tokens.
  * @param {Object} account - The user's account information.
  * @param {Object} user - The user's information.
- * @param {string} redirectUrl - The URL to redirect the user to.
+ * @param {string} appUrl - The URL of the client application.
  */
-const setAuthCookies = (res, tokens, account, user, redirectUri) => {
+const setAuthCookies = (res, tokens, account, user, appUrl) => {
   const currentDateTime = new Date();
 
   const refreshMaxAge =
@@ -19,7 +19,7 @@ const setAuthCookies = (res, tokens, account, user, redirectUri) => {
     secure: process.env.NODE_ENV === 'production',
     // sameSite: 'Strict',
     // path: '/',
-    domain: redirectUri ? new URL(redirectUri).hostname : undefined,
+    domain: redirectUri ? new URL(appUrl).hostname : undefined,
   };
 
   res.cookie('x-refresh-token', tokens.refresh.token, {