fix: normalize api token type on insert

Unleash · Aug 23, 2024 · cd53ab9 · cd53ab9
1 parent 27798af
commit cd53ab9
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 1 deletion.
diff --git a/src/lib/services/api-token-service.test.ts b/src/lib/services/api-token-service.test.ts
@@ -6,6 +6,7 @@ import {
     API_TOKEN_CREATED,
     API_TOKEN_DELETED,
     API_TOKEN_UPDATED,
+    SYSTEM_USER,
     TEST_AUDIT_USER,
 } from '../types';
 import { addDays, minutesToMilliseconds, subDays } from 'date-fns';
@@ -216,3 +217,55 @@ describe('API token getTokenWithCache', () => {
         expect(apiTokenStoreGet).toHaveBeenCalledTimes(1);
     });
 });
+
+test('normalizes api token type casing to lowercase', async () => {
+    const config: IUnleashConfig = createTestConfig();
+    const { apiTokenStore, apiTokenService, environmentStore } =
+        createFakeApiTokenService(config);
+
+    await environmentStore.create({
+        name: 'default',
+        enabled: true,
+        type: 'test',
+        sortOrder: 1,
+    });
+
+    const apiTokenStoreInsert = jest.spyOn(apiTokenStore, 'insert');
+
+    await apiTokenService.createApiTokenWithProjects(
+        {
+            environment: 'default',
+            // @ts-ignore
+            type: 'CLIENT',
+            projects: [],
+            tokenName: 'uppercase-token',
+        },
+        SYSTEM_USER,
+    );
+
+    await apiTokenService.createApiTokenWithProjects(
+        {
+            environment: 'default',
+            // @ts-ignore
+            type: 'client',
+            projects: [],
+            tokenName: 'lowercase-token',
+        },
+        SYSTEM_USER,
+    );
+
+    expect(apiTokenStoreInsert).toHaveBeenCalledWith(
+        expect.objectContaining({
+            type: 'client',
+        }),
+    );
+
+    expect(apiTokenStoreInsert).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+            type: 'CLIENT',
+        }),
+    );
+
+    const tokens = await apiTokenStore.getAll();
+    expect(tokens.every((token) => token.type === 'client')).toBeTruthy();
+});
diff --git a/src/lib/services/api-token-service.ts b/src/lib/services/api-token-service.ts
@@ -330,12 +330,22 @@ export class ApiTokenService {
         return this.insertNewApiToken(createNewToken, SYSTEM_USER_AUDIT);
     }
 
+    private normalizeTokenType(token: IApiTokenCreate): IApiTokenCreate {
+        const { type, ...rest } = token;
+        return {
+            ...rest,
+            type: type.toLowerCase() as ApiTokenType,
+        };
+    }
+
     private async insertNewApiToken(
         newApiToken: IApiTokenCreate,
         auditUser: IAuditUser,
     ): Promise<IApiToken> {
         try {
-            const token = await this.store.insert(newApiToken);
+            const token = await this.store.insert(
+                this.normalizeTokenType(newApiToken),
+            );
             this.activeTokens.push(token);
             await this.eventService.storeEvent(
                 new ApiTokenCreatedEvent({