Refactor auth cookies

Author: MarceloRGonc

packages/server/api/src/app/authentication/authentication.controller.ts

@@ -18,8 +18,8 @@ import { userService } from '../user/user-service';
 import { analyticsAuthenticationService } from './analytics-authentication-service';
 import { authenticationService } from './basic/authentication-service';
 import {
-  removeAuthCookiesAndReply,
-  setAuthCookiesAndReply,
+  removeAuthCookies,
+  setAuthCookies,
 } from './context/authentication-cookies';
 
 const edition = system.getEdition();
@@ -55,7 +55,7 @@ export const authenticationController: FastifyPluginAsyncTypebox = async (
       },
     },
     async (request, reply) => {
-      return removeAuthCookiesAndReply(reply);
+      return removeAuthCookies(reply).send('Cookies removed');
     },
   );
 
@@ -107,7 +107,7 @@ const signUpRoute = async (request: any, reply: any) => {
     provider: Provider.EMAIL,
   });
 
-  return setAuthCookiesAndReply(reply, signUpResponse);
+  return setAuthCookies(reply, signUpResponse).send(signUpResponse);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -124,7 +124,7 @@ const signInRoute = async (request: any, reply: any) => {
     provider: Provider.EMAIL,
   });
 
-  return setAuthCookiesAndReply(reply, signInResponse);
+  return setAuthCookies(reply, signInResponse).send(signInResponse);
 };
 
 const rateLimitOptions: RateLimitOptions = {

packages/server/api/src/app/authentication/context/authentication-cookies.ts

@@ -8,12 +8,18 @@ import { FastifyReply } from 'fastify';
 import { jwtDecode } from 'jwt-decode';
 import { getSubDomain } from '../../helper/sub-domain';
 
-export function setAuthCookiesAndReply(
+export function setAuthCookies(
   reply: FastifyReply,
   response: AuthenticationResponse,
+  expireInSeconds?: number,
 ): FastifyReply {
-  const date = jwtDecode<{ exp: number }>(response.tablesRefreshToken);
-  const cookieExpiryDate = new Date(date.exp * 1000);
+  let cookieExpiryDate: Date;
+  if (expireInSeconds) {
+    cookieExpiryDate = new Date(expireInSeconds * 1000);
+  } else {
+    const date = jwtDecode<{ exp: number }>(response.tablesRefreshToken);
+    cookieExpiryDate = new Date(date.exp * 1000);
+  }
 
   return reply
     .setCookie('jwt_token', response.tablesRefreshToken, {
@@ -37,11 +43,10 @@ export function setAuthCookiesAndReply(
       httpOnly: false,
       expires: cookieExpiryDate,
       sameSite: 'lax',
-    })
-    .send(response);
+    });
 }
 
-export function removeAuthCookiesAndReply(reply: FastifyReply): FastifyReply {
+export function removeAuthCookies(reply: FastifyReply): FastifyReply {
   return reply
     .clearCookie('jwt_token', {
       domain: getOpenOpsSubDomain(),
@@ -53,8 +58,7 @@ export function removeAuthCookiesAndReply(reply: FastifyReply): FastifyReply {
     .clearCookie('baserow_group_id', {
       domain: getOpenOpsSubDomain(),
       path: '/',
-    })
-    .send('Cookies removed');
+    });
 }
 
 function getOpenOpsSubDomain(): string {