Skip to content

Commit c594038

Browse files
committed
Fix database token creation
1 parent 212990c commit c594038

3 files changed

Lines changed: 17 additions & 26 deletions

File tree

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,16 @@ export type DatabaseToken = {
1515
};
1616
};
1717

18-
export type CreateDatabaseTokenParams = {
19-
token: string;
20-
projectId: string;
21-
workspaceId: number;
22-
};
23-
24-
export async function createProjectDatabaseToken(
25-
params: CreateDatabaseTokenParams,
18+
export async function createDatabaseToken(
19+
workspaceId: number,
20+
token: string,
2621
): Promise<DatabaseToken> {
2722
const payload = {
28-
name: `${TOKEN_NAME_PREFIX}${params.projectId}`,
29-
workspace: params.workspaceId,
23+
name: 'OpenOps Token',
24+
workspace: workspaceId,
3025
};
3126

32-
const headers = createAxiosHeaders(params.token);
27+
const headers = createAxiosHeaders(token);
3328

3429
return makeOpenOpsTablesPost<DatabaseToken>(
3530
'api/database/tokens/',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { addUserToWorkspace } from './add-user-workspace';
22
import { createDatabase } from './create-database';
3-
import { createProjectDatabaseToken } from './create-database-token';
3+
import { createDatabaseToken } from './create-database-token';
44
import { createMcpEndpoint } from './create-mcp-endpoint';
55
import { createTable } from './create-table';
66
import { createUser } from './create-user';
@@ -17,7 +17,7 @@ export const openopsTables = {
1717
addUserToWorkspace,
1818
listDatabases,
1919
createDatabase,
20-
createProjectDatabaseToken,
20+
createDatabaseToken,
2121
createTable,
2222
listWorkspaces,
2323
createWorkspace,

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@ const openopsCommonMock = {
66
jest.mock('@openops/common', () => openopsCommonMock);
77

88
import { AxiosHeaders } from 'axios';
9-
import { createProjectDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
9+
import { createDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
1010

1111
describe('createProjectDatabaseToken', () => {
1212
beforeEach(() => {
1313
jest.clearAllMocks();
1414
});
1515

1616
it('should return the created token on successful creation', async () => {
17-
const params = {
18-
token: 'test_system_token',
19-
projectId: 'test-project-123',
20-
workspaceId: 1,
21-
};
17+
const token = 'test_system_token';
18+
const workspaceId = 1;
19+
2220
const mockHeaders = new AxiosHeaders({
2321
'Content-Type': 'application/json',
24-
Authorization: `JWT ${params.token}`,
22+
Authorization: `JWT ${token}`,
2523
});
2624
const mockTokenResponse = {
2725
id: 1,
@@ -41,18 +39,16 @@ describe('createProjectDatabaseToken', () => {
4139
mockTokenResponse,
4240
);
4341

44-
const result = await createProjectDatabaseToken(params);
42+
const result = await createDatabaseToken(workspaceId, token);
4543

4644
expect(result).toEqual(mockTokenResponse);
4745
expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledTimes(1);
48-
expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledWith(
49-
params.token,
50-
);
46+
expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledWith(token);
5147
expect(openopsCommonMock.makeOpenOpsTablesPost).toHaveBeenCalledWith(
5248
'api/database/tokens/',
5349
{
54-
name: 'Project_test-project-123',
55-
workspace: params.workspaceId,
50+
name: 'OpenOps Token',
51+
workspace: workspaceId,
5652
},
5753
mockHeaders,
5854
);

0 commit comments

Comments
 (0)