Skip to content

Commit 27666e2

Browse files
cezudasCopilot
andauthored
Set tables workspace selection cookie upon user signup/signin (#1628)
Part of OPS-3008. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent fbe5a81 commit 27666e2

3 files changed

Lines changed: 14 additions & 0 deletions

File tree

packages/server/api/src/app/authentication/basic/authentication-service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export const authenticationService = {
5858
projectId: projectContext.project.id,
5959
projectRole: projectContext.projectRole,
6060
tablesRefreshToken: projectContext.tablesRefreshToken,
61+
tablesWorkspaceId: projectContext.project.tablesWorkspaceId,
6162
};
6263
},
6364
};

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ export function setAuthCookiesAndReply(
3030
expires: cookieExpiryDate,
3131
sameSite: 'lax',
3232
})
33+
.setCookie('baserow_group_id', String(response.tablesWorkspaceId), {
34+
domain: getOpenOpsSubDomain(),
35+
path: '/',
36+
signed: true,
37+
httpOnly: false,
38+
expires: cookieExpiryDate,
39+
sameSite: 'lax',
40+
})
3341
.send(response);
3442
}
3543

@@ -42,6 +50,10 @@ export function removeAuthCookiesAndReply(reply: FastifyReply): FastifyReply {
4250
.clearCookie('token', {
4351
path: '/',
4452
})
53+
.clearCookie('baserow_group_id', {
54+
domain: getOpenOpsSubDomain(),
55+
path: '/',
56+
})
4557
.send('Cookies removed');
4658
}
4759

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ export type AuthenticationResponse = UserWithoutPassword & {
88
projectId: string;
99
projectRole: ProjectMemberRole | null;
1010
tablesRefreshToken: string;
11+
tablesWorkspaceId: number;
1112
};

0 commit comments

Comments
 (0)