Drop extra service layer and setup prefixing the database token name in the API he;per

Author: cezudas

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

@@ -1,5 +1,7 @@
 import { createAxiosHeaders, makeOpenOpsTablesPost } from '@openops/common';
 
+const TOKEN_NAME_PREFIX = 'Project_';
+
 export type DatabaseToken = {
   id: number;
   name: string;
@@ -14,25 +16,24 @@ export type DatabaseToken = {
 };
 
 export type CreateDatabaseTokenParams = {
-  name: string;
+  token: string;
+  projectId: string;
   workspaceId: number;
-  systemToken: string;
 };
 
-export async function createDatabaseToken(
+export async function createProjectDatabaseToken(
   params: CreateDatabaseTokenParams,
 ): Promise<DatabaseToken> {
   const payload = {
-    name: params.name,
+    name: `${TOKEN_NAME_PREFIX}${params.projectId}`,
     workspace: params.workspaceId,
   };
 
-  const headers = createAxiosHeaders(params.systemToken);
-  const response = await makeOpenOpsTablesPost<DatabaseToken>(
+  const headers = createAxiosHeaders(params.token);
+
+  return makeOpenOpsTablesPost<DatabaseToken>(
     'api/database/tokens/',
     payload,
     headers,
   );
-
-  return response;
 }

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

@@ -1,26 +1,31 @@
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
   makeOpenOpsTablesPost: jest.fn(),
+  createAxiosHeaders: jest.fn(),
 };
 jest.mock('@openops/common', () => openopsCommonMock);
 
 import { AxiosHeaders } from 'axios';
-import { createDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
+import { createProjectDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
 
-describe('createDatabaseToken', () => {
+describe('createProjectDatabaseToken', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('should return the created token on successful creation', async () => {
     const params = {
-      name: 'Test Token',
+      token: 'test_system_token',
+      projectId: 'test-project-123',
       workspaceId: 1,
-      systemToken: 'test_system_token',
     };
+    const mockHeaders = new AxiosHeaders({
+      'Content-Type': 'application/json',
+      Authorization: `JWT ${params.token}`,
+    });
     const mockTokenResponse = {
       id: 1,
-      name: 'Test Token',
+      name: 'Project_test-project-123',
       workspace: 1,
       key: 'test_database_token_key',
       permissions: {
@@ -31,23 +36,25 @@ describe('createDatabaseToken', () => {
       },
     };
 
+    openopsCommonMock.createAxiosHeaders.mockReturnValue(mockHeaders);
     openopsCommonMock.makeOpenOpsTablesPost.mockResolvedValue(
       mockTokenResponse,
     );
 
-    const result = await createDatabaseToken(params);
+    const result = await createProjectDatabaseToken(params);
 
     expect(result).toEqual(mockTokenResponse);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledWith(
+      params.token,
+    );
     expect(openopsCommonMock.makeOpenOpsTablesPost).toHaveBeenCalledWith(
       'api/database/tokens/',
       {
-        name: params.name,
+        name: 'Project_test-project-123',
         workspace: params.workspaceId,
       },
-      new AxiosHeaders({
-        'Content-Type': 'application/json',
-        Authorization: `JWT ${params.systemToken}`,
-      }),
+      mockHeaders,
     );
   });
 });