Make tablesWorkspaceId mandatory

Author: cezudas

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

@@ -15,7 +15,7 @@ export function setAuthCookiesAndReply(
   const date = jwtDecode<{ exp: number }>(response.tablesRefreshToken);
   const cookieExpiryDate = new Date(date.exp * 1000);
 
-  let replyWithCookies = reply
+  return reply
     .setCookie('jwt_token', response.tablesRefreshToken, {
       domain: getOpenOpsSubDomain(),
       path: '/',
@@ -29,24 +29,16 @@ export function setAuthCookiesAndReply(
       httpOnly: false,
       expires: cookieExpiryDate,
       sameSite: 'lax',
-    });
-
-  if (response.tablesWorkspaceId !== undefined) {
-    replyWithCookies = replyWithCookies.setCookie(
-      'baserow_group_id',
-      String(response.tablesWorkspaceId),
-      {
-        domain: getOpenOpsSubDomain(),
-        path: '/',
-        signed: true,
-        httpOnly: false,
-        expires: cookieExpiryDate,
-        sameSite: 'lax',
-      },
-    );
-  }
-
-  return replyWithCookies.send(response);
+    })
+    .setCookie('baserow_group_id', String(response.tablesWorkspaceId), {
+      domain: getOpenOpsSubDomain(),
+      path: '/',
+      signed: true,
+      httpOnly: false,
+      expires: cookieExpiryDate,
+      sameSite: 'lax',
+    })
+    .send(response);
 }
 
 export function removeAuthCookiesAndReply(reply: FastifyReply): FastifyReply {

packages/shared/src/lib/authentication/dto/authentication-response.ts

@@ -8,5 +8,5 @@ export type AuthenticationResponse = UserWithoutPassword & {
   projectId: string;
   projectRole: ProjectMemberRole | null;
   tablesRefreshToken: string;
-  tablesWorkspaceId?: number;
+  tablesWorkspaceId: number;
 };