propro-utils 1.4.50 → 1.4.52

package/package.json

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

package/src/server/index.js

@@ -121,7 +121,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
         const user = await checkIfUserExists(userSchema, account.accountId);
 
-        setAuthCookies(res, tokens, account, user);
+        setAuthCookies(res, tokens, account, user, redirectUrl);
 
         const urlToRedirect = formatRedirectUrl(redirectUrl);
 

package/src/server/middleware/setAuthCookies.js

@@ -5,36 +5,43 @@
  * @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.
  */
-const setAuthCookies = (res, tokens, account, user) => {
+const setAuthCookies = (res, tokens, account, user, redirectUri) => {
   const currentDateTime = new Date();
 
   const refreshMaxAge =
     new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+  const accessMaxAge =
+    new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+
+  const commonAttributes = {
+    secure: process.env.NODE_ENV === 'production',
+    // sameSite: 'Strict',
+    // path: '/',
+    domain: redirectUri ? new URL(redirectUri).hostname : undefined,
+  };
 
   res.cookie('x-refresh-token', tokens.refresh.token, {
     httpOnly: true,
-    secure: process.env.NODE_ENV === 'production',
     maxAge: refreshMaxAge,
+    ...commonAttributes,
   });
 
-  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,
+    ...commonAttributes,
   });
 
   res.cookie('user', JSON.stringify(user), {
     maxAge: refreshMaxAge,
-    secure: process.env.NODE_ENV === 'production',
+    ...commonAttributes,
   });
 
   res.cookie('account', JSON.stringify(account), {
     maxAge: refreshMaxAge,
-    secure: process.env.NODE_ENV === 'production',
+    ...commonAttributes,
   });
 
   res.cookie(
@@ -42,7 +49,7 @@ const setAuthCookies = (res, tokens, account, user) => {
     JSON.stringify({ value: 'true', expires: accessMaxAge }),
     {
       maxAge: accessMaxAge,
-      secure: process.env.NODE_ENV === 'production',
+      ...commonAttributes,
     }
   );
 };