propro-utils 1.7.18 → 1.7.20

package/package.json

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

package/src/server/index.js

@@ -6,6 +6,7 @@ const {
 const {
   setAuthCookies,
   clearAuthCookies,
+  prepAuthCookies,
 } = require('./middleware/cookieUtils');
 const { checkIfUserExists } = require('../../middlewares/account_info');
 const authValidation = require('../../middlewares/access_token');
@@ -101,7 +102,27 @@ class AuthMiddleware {
         res.status(response.status).json({ account, user, tokens });
       } else {
         const { tokens, urlToRedirect } = response.data;
-        setAuthCookies(res, tokens, account, user, this.options.appUrl);
+        
+        const cookies = prepAuthCookies(tokens, account, user, this.options.appUrl);
+        Object.entries(cookies).forEach(
+          ([name, config]) => {
+            try{
+              console.log(domain,'Setting cookie 1:', {name, value: config.value, commonAttributes, config})
+              res.cookie(name, config.value, {
+                ...commonAttributes,
+                ...config,
+              });
+              // console.log('Setting cookie 2:', {response})
+            } catch (error) {
+              console.error('Error setting cookie: Object.entries', {
+                error: error.message,
+                stack: error.stack,
+              });
+            }
+          }
+        );
+        console.log('cookies:', cookies);
+        // setAuthCookies(res, tokens, account, user, this.options.appUrl);
         res.status(response.status).json({ urlToRedirect });
       }
     } catch (error) {

package/src/server/middleware/cookieUtils.js

@@ -104,13 +104,13 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   try {
     domain = appUrl ? new URL(appUrl).hostname : undefined;
     if (domain?.includes('mapmap.app')) {
-      domain = 'https://mapmap.app';
+      domain = '.mapmap.app';
     }
     if (domain?.includes('localhost')) {
       domain = undefined;
     }
     if (domain?.includes('propro.so')) {
-      domain = 'https://propro.so';
+      domain = 'propro.so';
     }
   } catch (error) {
     console.error('Invalid appUrl:', { error, appUrl });
@@ -217,6 +217,83 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   }
 };
 
+const prepAuthCookies = async (tokens, account, user, appUrl) => {
+  if (!tokens?.refresh?.token || !tokens?.access?.token) {
+    throw new Error('Invalid tokens object');
+  }
+  if (!account) {
+    throw new Error('Invalid account object');
+  }
+  if (!user) {
+    throw new Error('Invalid user object');
+  }
+
+  const currentDateTime = new Date();
+  const refreshMaxAge =
+    new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+  const accessMaxAge =
+    new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+
+  // Domain configuration
+  let domain;
+  try {
+    domain = appUrl ? new URL(appUrl).hostname : undefined;
+    if (domain?.includes('mapmap.app')) {
+      domain = '.mapmap.app';
+    }
+    if (domain?.includes('localhost')) {
+      domain = undefined;
+    }
+    if (domain?.includes('propro.so')) {
+      domain = 'propro.so';
+    }
+  } catch (error) {
+    console.error('Invalid appUrl:', { error, appUrl });
+    domain = undefined;
+  }
+
+  const commonAttributes = {
+    secure: true,
+    sameSite: 'None',
+    domain,
+    path: '/',
+  };
+
+  const httpOnlyCookies = {
+    'x-refresh-token': {
+      value: tokens.refresh.token,
+      maxAge: refreshMaxAge,
+      httpOnly: true,
+    },
+    'x-access-token': {
+      value: tokens.access.token,
+      maxAge: accessMaxAge,
+      httpOnly: true,
+    },
+  };
+
+  const sanitizedUser = sanitizeUser(user);
+  const sanitizedAccount = { ...account };
+  delete sanitizedAccount.passwordHistory;
+
+  const regularCookies = {
+    user: {
+      value: safeStringify(sanitizedUser),
+      maxAge: refreshMaxAge,
+    },
+    account: {
+      value: safeStringify(sanitizedAccount),
+      maxAge: refreshMaxAge,
+    },
+    has_account_token: {
+      value: JSON.stringify({ value: 'true', expires: accessMaxAge }),
+      maxAge: accessMaxAge,
+    },
+  };
+
+  return {...httpOnlyCookies, ...regularCookies, ...commonAttributes}
+};
+
 /**
  * Clears cookies from both web and extension contexts
  */
@@ -284,4 +361,5 @@ const clearAuthCookies = async (res, appUrl) => {
 module.exports = {
   setAuthCookies,
   clearAuthCookies,
+  prepAuthCookies
 };