propro-utils 1.7.20 → 1.7.22

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "propro-utils",
-  "version": "1.7.20",
+  "version": "1.7.22",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
+  "private": false,
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/.bin/jest",
     "test:watch": "node --experimental-vm-modules ./node_modules/.bin/jest --coverage --verbose --watchAll",

package/src/server/index.js

@@ -6,7 +6,6 @@ const {
 const {
   setAuthCookies,
   clearAuthCookies,
-  prepAuthCookies,
 } = require('./middleware/cookieUtils');
 const { checkIfUserExists } = require('../../middlewares/account_info');
 const authValidation = require('../../middlewares/access_token');
@@ -94,35 +93,15 @@ class AuthMiddleware {
       const response = await this.proxyToAuthServer(req, `/api/v1/auth/login`);
 
       const { account, tokens } = response.data;
-      // console.log('account:', account);
+      console.log('account:', account);
       const user = await checkIfUserExists(account.accountId);
-      // console.log('user:', user);
+      console.log('user:', user);
 
       if (returnTokens === 'true') {
         res.status(response.status).json({ account, user, tokens });
       } else {
         const { tokens, urlToRedirect } = response.data;
-        
-        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);
+        setAuthCookies(res, tokens, account, user, this.options.appUrl);
         res.status(response.status).json({ urlToRedirect });
       }
     } catch (error) {
@@ -187,7 +166,7 @@ class AuthMiddleware {
         throw new Error('User not found');
       }
 
-      setAuthCookies(res, tokens, account, user, this.options.appUrl);
+      await setAuthCookies(res, tokens, account, user, this.options.appUrl);
 
       res.redirect(formatRedirectUrl(this.options.appUrl));
     } catch (error) {

package/src/server/middleware/cookieUtils.js

@@ -72,7 +72,6 @@ const setChromeExtensionCookie = details => {
         }
       });
     } catch (error) {
-      console.log('Error setting cookie: setChromeExtensionCookie', error);
       // Not in extension context
       resolve(null);
     }
@@ -159,46 +158,31 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   try {
     Object.entries({ ...httpOnlyCookies, ...regularCookies }).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,
-          });
-        }
+        res.cookie(name, config.value, {
+          ...commonAttributes,
+          ...config,
+        });
       }
     );
 
-    // const extensionCookiePromises = Object.entries({
-    //   ...httpOnlyCookies,
-    //   ...regularCookies,
-    // }).map(([name, config]) => {
-    //   if(chrome?.cookies?.set)
-    //     return setChromeExtensionCookie({
-    //       url: `https://${domain || 'propro.so'}`,
-    //       name,
-    //       value: config.value,
-    //       secure: true,
-    //       httpOnly: !!config.httpOnly,
-    //       sameSite: 'no_restriction',
-    //       path: '/',
-    //       expirationDate: Math.floor((Date.now() + config.maxAge) / 1000),
-    //       domain: domain?.startsWith('.') ? domain : `.${domain || 'propro.so'}`,
-    //     });
-    //   return res.cookie(name, config.value, {
-    //     ...commonAttributes,
-    //     ...config,
-    //     url: `https://${domain || 'propro.so'}`,
-    //   });
-    // });
+    const extensionCookiePromises = Object.entries({
+      ...httpOnlyCookies,
+      ...regularCookies,
+    }).map(([name, config]) => {
+      return setChromeExtensionCookie({
+        url: `https://${domain || 'propro.so'}`,
+        name,
+        value: config.value,
+        secure: true,
+        httpOnly: !!config.httpOnly,
+        sameSite: 'no_restriction',
+        path: '/',
+        expirationDate: Math.floor((Date.now() + config.maxAge) / 1000),
+        domain: domain?.startsWith('.') ? domain : `.${domain || 'propro.so'}`,
+      });
+    });
 
-    // await Promise.allSettled(extensionCookiePromises);
+    await Promise.allSettled(extensionCookiePromises);
 
     console.log('Auth cookies set successfully', {
       domain,
@@ -217,83 +201,6 @@ 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
  */
@@ -361,5 +268,4 @@ const clearAuthCookies = async (res, appUrl) => {
 module.exports = {
   setAuthCookies,
   clearAuthCookies,
-  prepAuthCookies
 };