propro-utils 1.7.25 → 1.7.27

package/middlewares/access_token.js

@@ -70,10 +70,14 @@ const authValidation = (requiredPermissions = []) => {
 
       req.account = accountId;
 
-      const user = await checkIfUserExists(accountId);
-      if (!user) {
-        return res.status(403).json({ error: 'User not found' });
+      let user = null;
+      try {
+        user = await checkIfUserExists(account.accountId);
+        if (!user) throw new Error('User not found');
+      } catch (error) {
+        return res.status(403).json({error: error?.message || 'User not found'});
       }
+     
       req.user = user.id;
       next();
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.7.25",
+  "version": "1.7.27",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "private": false,

package/src/server/index.js

@@ -93,9 +93,14 @@ class AuthMiddleware {
       const response = await this.proxyToAuthServer(req, `/api/v1/auth/login`);
 
       const { account, tokens } = response.data;
-      console.log('account:', account);
-      const user = await checkIfUserExists(account.accountId);
-      console.log('user:', user);
+      
+      let user = null;
+      try {
+        user = await checkIfUserExists(account.accountId);
+        if (!user) throw new Error('User not found');
+      } catch (error) {
+        return res.status(403).json({error: error?.message || 'User not found'});
+      }
 
       if (returnTokens === 'true') {
         res.status(response.status).json({ account, user, tokens });
@@ -160,10 +165,12 @@ class AuthMiddleware {
         this.options.redirectUri
       );
 
-      const user = await checkIfUserExists(account.accountId);
-
-      if (!user) {
-        throw new Error('User not found');
+      let user = null;
+      try {
+        user = await checkIfUserExists(account.accountId);
+        if (!user) throw new Error('User not found');
+      } catch (error) {
+        return res.status(403).json({error: error?.message || 'User not found'});
       }
 
       await setAuthCookies(res, tokens, account, user, this.options.appUrl);

package/src/server/middleware/cookieUtils.js

@@ -101,9 +101,7 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   // Domain configuration
   let domain;
   try {
-    console.log('** APP URL', appUrl)
     domain = appUrl ? new URL(appUrl).hostname : undefined;
-    console.log('** DOMAIN', domain)
     if (domain?.includes('mapmap.app')) {
       domain = '.mapmap.app';
     }
@@ -114,7 +112,6 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       domain = 'propro.so';
     }
   } catch (error) {
-    console.log('** ERROR', error)
     console.error('Invalid appUrl:', { error, appUrl });
     domain = undefined;
   }
@@ -126,10 +123,6 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
     path: '/',
   };
 
-    console.log('** MAX AGES', {
-      refreshMaxAge,
-      accessMaxAge
-    })
   const httpOnlyCookies = {
     'x-refresh-token': {
       value: tokens.refresh.token,
@@ -145,7 +138,7 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
 
   const sanitizedUser = sanitizeUser(user);
   const sanitizedAccount = { ...account };
-  delete sanitizedAccount?.passwordHistory;
+  delete sanitizedAccount.passwordHistory;
 
   const regularCookies = {
     user: {
@@ -162,11 +155,6 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
     },
   };
 
-  console.log('** SURVIVED OBJECTIFYING COOKIES', {
-    httpOnlyCookies,
-    regularCookies,
-  })
-
   try {
     Object.entries({ ...httpOnlyCookies, ...regularCookies }).forEach(
       ([name, config]) => {
@@ -177,7 +165,6 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       }
     );
 
-/*
     const extensionCookiePromises = Object.entries({
       ...httpOnlyCookies,
       ...regularCookies,
@@ -196,7 +183,6 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
     });
 
     await Promise.allSettled(extensionCookiePromises);
-*/
 
     console.log('Auth cookies set successfully', {
       domain,

package/src/server/middleware/verifyToken.js

@@ -120,7 +120,7 @@ const VerifyAccount = requiredPermissions => {
         req.user = userResponse.data;
         return next();
       } catch (networkError) {
-        return res.status(500).json({ error: 'Error validating token' });
+        return res.status(401).json({ error: 'Error validating token' });
       }
     }
   };