Merge branch 'main' into mg/OPS-2983

Author: MarceloRGonc

packages/openops/src/lib/openops-tables/types/database-token.ts

@@ -0,0 +1,12 @@
+export type DatabaseToken = {
+  id: number;
+  name: string;
+  workspace: number;
+  key: string;
+  permissions: {
+    create: boolean;
+    read: boolean;
+    update: boolean;
+    delete: boolean;
+  };
+};

packages/openops/src/lib/openops-tables/types/index.ts

@@ -1,5 +1,6 @@
 export * from './application';
 export * from './auth-user';
+export * from './database-token';
 export * from './mcp';
 export * from './table-workspace';
 export * from './user';

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

@@ -58,6 +58,7 @@ export const authenticationService = {
       projectId: projectContext.project.id,
       projectRole: projectContext.projectRole,
       tablesRefreshToken: projectContext.tablesRefreshToken,
+      tablesWorkspaceId: projectContext.project.tablesWorkspaceId,
     };
   },
 };

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

@@ -30,6 +30,14 @@ export function setAuthCookiesAndReply(
       expires: cookieExpiryDate,
       sameSite: 'lax',
     })
+    .setCookie('baserow_group_id', String(response.tablesWorkspaceId), {
+      domain: getOpenOpsSubDomain(),
+      path: '/',
+      signed: true,
+      httpOnly: false,
+      expires: cookieExpiryDate,
+      sameSite: 'lax',
+    })
     .send(response);
 }
 
@@ -42,6 +50,10 @@ export function removeAuthCookiesAndReply(reply: FastifyReply): FastifyReply {
     .clearCookie('token', {
       path: '/',
     })
+    .clearCookie('baserow_group_id', {
+      domain: getOpenOpsSubDomain(),
+      path: '/',
+    })
     .send('Cookies removed');
 }
 

packages/server/api/src/app/openops-tables/create-database-token.ts

@@ -1,19 +1,8 @@
-import { createAxiosHeaders, makeOpenOpsTablesPost } from '@openops/common';
-
-const TOKEN_NAME_PREFIX = 'Project_';
-
-export type DatabaseToken = {
-  id: number;
-  name: string;
-  workspace: number;
-  key: string;
-  permissions: {
-    create: boolean;
-    read: boolean;
-    update: boolean;
-    delete: boolean;
-  };
-};
+import {
+  createAxiosHeaders,
+  DatabaseToken,
+  makeOpenOpsTablesPost,
+} from '@openops/common';
 
 export async function createDatabaseToken(
   workspaceId: number,

packages/server/api/src/app/openops-tables/index.ts

@@ -8,6 +8,7 @@ import { createWorkspace } from './create-workspace';
 import { createDefaultWorkspaceAndDatabase } from './default-workspace-database';
 import { getMcpEndpointList } from './get-mcp-endpoint-list';
 import { getWorkspaceByName } from './get-workspace-by-name';
+import { listDatabaseTokens } from './list-database-tokens';
 import { listDatabases } from './list-databases';
 import { listWorkspaces } from './list-workspaces';
 import { renameDatabase } from './rename-database';
@@ -17,6 +18,7 @@ export const openopsTables = {
   addUserToWorkspace,
   listDatabases,
   createDatabase,
+  listDatabaseTokens,
   createDatabaseToken,
   createTable,
   listWorkspaces,

packages/server/api/src/app/openops-tables/list-database-tokens.ts

@@ -0,0 +1,17 @@
+import {
+  createAxiosHeaders,
+  DatabaseToken,
+  makeOpenOpsTablesGet,
+} from '@openops/common';
+
+export async function listDatabaseTokens(
+  workspaceId: number,
+  token: string,
+): Promise<DatabaseToken[]> {
+  const tokens = await makeOpenOpsTablesGet<DatabaseToken>(
+    'api/database/tokens/',
+    createAxiosHeaders(token),
+  );
+
+  return tokens.flat().filter((t) => t.workspace === workspaceId);
+}

packages/server/api/test/unit/openops-tables/create-database-token.test.ts

@@ -8,7 +8,7 @@ jest.mock('@openops/common', () => openopsCommonMock);
 import { AxiosHeaders } from 'axios';
 import { createDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
 
-describe('createProjectDatabaseToken', () => {
+describe('createDatabaseToken', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });

packages/server/api/test/unit/openops-tables/list-databases-tokens.test.ts

@@ -0,0 +1,114 @@
+const openopsCommonMock = {
+  ...jest.requireActual('@openops/common'),
+  makeOpenOpsTablesGet: jest.fn(),
+};
+jest.mock('@openops/common', () => openopsCommonMock);
+
+import { DatabaseToken } from '@openops/common';
+import { AxiosHeaders } from 'axios';
+import { listDatabaseTokens } from '../../../src/app/openops-tables/list-database-tokens';
+
+describe('listDatabases', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return only database tokens for the provided workspace', async () => {
+    const workspaceId = 1;
+    const token = 'test_token';
+    const mockApplications: DatabaseToken[] = [
+      {
+        id: 1,
+        name: 'Token 1',
+        workspace: workspaceId,
+        key: 'key',
+        permissions: { create: true, read: true, update: true, delete: true },
+      },
+      {
+        id: 2,
+        name: 'Token 2',
+        workspace: 2,
+        key: 'key',
+        permissions: { create: true, read: true, update: true, delete: true },
+      },
+      {
+        id: 3,
+        name: 'Token 3',
+        workspace: workspaceId,
+        key: 'key',
+        permissions: { create: true, read: true, update: true, delete: true },
+      },
+      {
+        id: 4,
+        name: 'Token 4',
+        workspace: 2,
+        key: 'key',
+        permissions: { create: true, read: true, update: true, delete: true },
+      },
+    ];
+
+    openopsCommonMock.makeOpenOpsTablesGet.mockResolvedValue([
+      mockApplications,
+    ]);
+
+    const result = await listDatabaseTokens(workspaceId, token);
+
+    expect(result).toHaveLength(2);
+    expect(result).toEqual([mockApplications[0], mockApplications[2]]);
+    expect(openopsCommonMock.makeOpenOpsTablesGet).toHaveBeenCalledWith(
+      'api/database/tokens/',
+      new AxiosHeaders({
+        'Content-Type': 'application/json',
+        Authorization: `JWT ${token}`,
+      }),
+    );
+  });
+
+  it('should return empty array when no database tokens exist for the workspace', async () => {
+    const workspaceId = 1;
+    const token = 'test_token';
+    const mockApplications: DatabaseToken[] = [
+      {
+        id: 4,
+        name: 'Token 4',
+        workspace: 2,
+        key: 'key',
+        permissions: { create: true, read: true, update: true, delete: true },
+      },
+    ];
+
+    openopsCommonMock.makeOpenOpsTablesGet.mockResolvedValue(mockApplications);
+
+    const result = await listDatabaseTokens(workspaceId, token);
+
+    expect(result).toHaveLength(0);
+    expect(result).toEqual([]);
+    expect(openopsCommonMock.makeOpenOpsTablesGet).toHaveBeenCalledWith(
+      'api/database/tokens/',
+      new AxiosHeaders({
+        'Content-Type': 'application/json',
+        Authorization: `JWT ${token}`,
+      }),
+    );
+  });
+
+  it('should return empty array when no database tokens exist', async () => {
+    const workspaceId = 1;
+    const token = 'test_token';
+    const mockApplications: DatabaseToken[] = [];
+
+    openopsCommonMock.makeOpenOpsTablesGet.mockResolvedValue(mockApplications);
+
+    const result = await listDatabaseTokens(workspaceId, token);
+
+    expect(result).toHaveLength(0);
+    expect(result).toEqual([]);
+    expect(openopsCommonMock.makeOpenOpsTablesGet).toHaveBeenCalledWith(
+      'api/database/tokens/',
+      new AxiosHeaders({
+        'Content-Type': 'application/json',
+        Authorization: `JWT ${token}`,
+      }),
+    );
+  });
+});

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

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