propro-utils 1.4.40 → 1.4.42

package/package.json

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

package/src/server/index.js

@@ -3,6 +3,7 @@ const {
   exchangeToken,
   formatRedirectUrl,
 } = require('./middleware/verifyToken');
+const { setAuthCookies } = require('./middleware/setAuthCookies');
 const { checkIfUserExists } = require('../../middlewares/account_info');
 const { post } = require('axios');
 
@@ -33,43 +34,6 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
   let refreshToken;
 
-  const setAuthCookies = (res, tokens, account, user) => {
-    const currentDateTime = new Date();
-
-    const refreshMaxAge =
-      new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
-
-    res.cookie('x-refresh-token', tokens.refresh.token, {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
-      maxAge: refreshMaxAge,
-    });
-
-    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,
-    });
-
-    res.cookie('user', JSON.stringify(user), {
-      maxAge: refreshMaxAge,
-      secure: process.env.NODE_ENV === 'production',
-    });
-
-    res.cookie('account', JSON.stringify(account), {
-      maxAge: refreshMaxAge,
-      secure: process.env.NODE_ENV === 'production',
-    });
-
-    res.cookie('has_account_token', 'true', {
-      maxAge: accessMaxAge,
-      secure: process.env.NODE_ENV === 'production',
-    });
-  };
-
   return async (req, res, next) => {
     try {
       if (
@@ -106,8 +70,6 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
         const formatedAuthUrl = formatRedirectUrl(authUrl);
 
-        console.log('making a refreshToken Request: ', refreshToken);
-
         let response;
 
         try {
@@ -134,16 +96,10 @@ function proproAuthMiddleware(options = {}, userSchema) {
             .json({ error: 'Invalid or expired refresh token' });
         }
 
-        console.log('Checking for existing user: ', account);
-
         const user = await checkIfUserExists(userSchema, account.accountId);
 
-        console.log('Setting Cookies: ', user, account);
-
         setAuthCookies(res, { access, refresh }, account, user);
 
-        console.log('Cookies Set: ');
-
         return res
           .status(200)
           .json({ message: 'Token refreshed successfully' });

package/src/server/middleware/setAuthCookies.js

@@ -0,0 +1,48 @@
+/**
+ * Sets the authentication cookies in the response object.
+ *
+ * @param {Object} res - The response object.
+ * @param {Object} tokens - The authentication tokens.
+ * @param {Object} account - The user's account information.
+ * @param {Object} user - The user's information.
+ */
+const setAuthCookies = (res, tokens, account, user) => {
+  const currentDateTime = new Date();
+
+  const refreshMaxAge =
+    new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+
+  res.cookie('x-refresh-token', tokens.refresh.token, {
+    httpOnly: true,
+    secure: process.env.NODE_ENV === 'production',
+    maxAge: refreshMaxAge,
+  });
+
+  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,
+  });
+
+  res.cookie('user', JSON.stringify(user), {
+    maxAge: refreshMaxAge,
+    secure: process.env.NODE_ENV === 'production',
+  });
+
+  res.cookie('account', JSON.stringify(account), {
+    maxAge: refreshMaxAge,
+    secure: process.env.NODE_ENV === 'production',
+  });
+
+  res.cookie('has_account_token', 'true', {
+    maxAge: accessMaxAge,
+    secure: process.env.NODE_ENV === 'production',
+  });
+};
+
+module.exports = {
+  setAuthCookies,
+};

package/src/server/middleware/setAuthCookies.test.js

@@ -0,0 +1,125 @@
+const { setAuthCookies } = require('./setAuthCookies');
+
+describe('setAuthCookies', () => {
+  let res;
+  let tokens;
+  let account;
+  let user;
+
+  beforeEach(() => {
+    res = {
+      cookie: jest.fn(),
+    };
+    tokens = {
+      refresh: {
+        token: 'refresh-token',
+        expires: '2024-03-23T00:00:00.000Z',
+      },
+      access: {
+        token: 'access-token',
+        expires: '2024-03-23T01:00:00.000Z',
+      },
+    };
+    account = {
+      id: 1,
+      name: 'Test Account',
+    };
+    user = {
+      id: 1,
+      name: 'Test User',
+    };
+  });
+
+  it('should set the x-refresh-token cookie with the correct options', () => {
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith(
+      'x-refresh-token',
+      tokens.refresh.token,
+      {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        maxAge: expect.any(Number),
+      }
+    );
+  });
+
+  it('should set the x-access-token cookie with the correct options', () => {
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith(
+      'x-access-token',
+      tokens.access.token,
+      {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        maxAge: expect.any(Number),
+      }
+    );
+  });
+
+  it('should set the user cookie with the correct options', () => {
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith('user', JSON.stringify(user), {
+      maxAge: expect.any(Number),
+      secure: process.env.NODE_ENV === 'production',
+    });
+  });
+
+  it('should set the account cookie with the correct options', () => {
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith(
+      'account',
+      JSON.stringify(account),
+      {
+        maxAge: expect.any(Number),
+        secure: process.env.NODE_ENV === 'production',
+      }
+    );
+  });
+
+  it('should set the has_account_token cookie with the correct options', () => {
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith('has_account_token', 'true', {
+      maxAge: expect.any(Number),
+      secure: process.env.NODE_ENV === 'production',
+    });
+  });
+
+  it('should set the maxAge of refresh-related cookies to the correct value', () => {
+    const currentDateTime = new Date();
+    const refreshMaxAge =
+      new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith(
+      'x-refresh-token',
+      expect.any(String),
+      expect.objectContaining({ maxAge: refreshMaxAge })
+    );
+    expect(res.cookie).toHaveBeenCalledWith(
+      'user',
+      expect.any(String),
+      expect.objectContaining({ maxAge: refreshMaxAge })
+    );
+    expect(res.cookie).toHaveBeenCalledWith(
+      'account',
+      expect.any(String),
+      expect.objectContaining({ maxAge: refreshMaxAge })
+    );
+  });
+
+  it('should set the maxAge of access-related cookies to the correct value', () => {
+    const currentDateTime = new Date();
+    const accessMaxAge =
+      new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+    setAuthCookies(res, tokens, account, user);
+    expect(res.cookie).toHaveBeenCalledWith(
+      'x-access-token',
+      expect.any(String),
+      expect.objectContaining({ maxAge: accessMaxAge })
+    );
+    expect(res.cookie).toHaveBeenCalledWith(
+      'has_account_token',
+      expect.any(String),
+      expect.objectContaining({ maxAge: accessMaxAge })
+    );
+  });
+});

package/src/server/middleware/verifyToken.js

@@ -160,8 +160,6 @@ function formatRedirectUrl(redirectUrl) {
     urlToRedirect = redirectUrl;
   }
 
-  console.log('Redirect URL:', urlToRedirect);
-
   return urlToRedirect;
 }