propro-utils 1.4.48 → 1.4.50

package/package.json

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

package/src/server/index.js

@@ -56,7 +56,6 @@ function proproAuthMiddleware(options = {}, userSchema) {
         if (req.cookies) {
           refreshToken = req.cookies['x-refresh-token'];
         }
-        console.log('refreshing tokens: ', refreshToken);
         if (!refreshToken) {
           const redirectUrl = constructRedirectUrl(
             clientUrl,
@@ -121,13 +120,9 @@ function proproAuthMiddleware(options = {}, userSchema) {
         );
 
         const user = await checkIfUserExists(userSchema, account.accountId);
-        console.log('user: ', user);
 
-        console.log('setting cookies: ', tokens, account, user);
         setAuthCookies(res, tokens, account, user);
 
-        console.log('setting cookies and redirectUrl: ', redirectUrl);
-
         const urlToRedirect = formatRedirectUrl(redirectUrl);
 
         return res.redirect(urlToRedirect);

package/src/server/middleware/setAuthCookies.js

@@ -39,7 +39,7 @@ const setAuthCookies = (res, tokens, account, user) => {
 
   res.cookie(
     'has_account_token',
-    JSON.stringify({ value: 'true', expires: expirationTime }),
+    JSON.stringify({ value: 'true', expires: accessMaxAge }),
     {
       maxAge: accessMaxAge,
       secure: process.env.NODE_ENV === 'production',

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

@@ -76,14 +76,6 @@ describe('setAuthCookies', () => {
     );
   });
 
-  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 =
@@ -116,10 +108,22 @@ describe('setAuthCookies', () => {
       expect.any(String),
       expect.objectContaining({ maxAge: accessMaxAge })
     );
+  });
+
+  it('should set the has_account_token cookie with the correct options', () => {
+    const currentDateTime = new Date();
+    const accessMaxAge =
+      new Date(tokens.access.expires).getTime() - currentDateTime.getTime();
+
+    setAuthCookies(res, tokens, account, user);
+
     expect(res.cookie).toHaveBeenCalledWith(
       'has_account_token',
-      expect.any(String),
-      expect.objectContaining({ maxAge: accessMaxAge })
+      JSON.stringify({ value: 'true', expires: accessMaxAge }),
+      {
+        maxAge: accessMaxAge,
+        secure: process.env.NODE_ENV === 'production',
+      }
     );
   });
 });