CCM-11496: codeql scan fix

Author: harrim91

lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts

@@ -347,6 +347,20 @@ describe('RoutingConfigurationApiClient', () => {
   });
 
   describe('submit', () => {
+    it('should return updated routing configuration on success', async () => {
+      axiosMock
+        .onPatch(`/v1/routing-configuration/${validRoutingConfigId}/submit`)
+        .reply(200, {
+          data: { id: validRoutingConfigId },
+        });
+
+      const response = await client.submit(validRoutingConfigId, 'test-token');
+
+      expect(response.error).toBeUndefined();
+      expect(response.data).toEqual({ id: validRoutingConfigId });
+      expect(axiosMock.history.patch.length).toBe(1);
+    });
+
     it('should return error when failing to update via API', async () => {
       axiosMock
         .onPatch(`/v1/routing-configuration/${notFoundRoutingConfigId}/submit`)
@@ -372,18 +386,20 @@ describe('RoutingConfigurationApiClient', () => {
       expect(axiosMock.history.patch.length).toBe(1);
     });
 
-    it('should return updated routing configuration on success', async () => {
-      axiosMock
-        .onPatch(`/v1/routing-configuration/${validRoutingConfigId}/submit`)
-        .reply(200, {
-          data: { id: validRoutingConfigId },
-        });
-
-      const response = await client.submit(validRoutingConfigId, 'test-token');
+    it('should return error for invalid routing config ID', async () => {
+      const response = await client.submit(
+        invalidRoutingConfigId,
+        'test-token'
+      );
 
-      expect(response.error).toBeUndefined();
-      expect(response.data).toEqual({ id: validRoutingConfigId });
-      expect(axiosMock.history.patch.length).toBe(1);
+      expect(response.error).toEqual({
+        errorMeta: {
+          code: 400,
+          description: 'Invalid routing configuration ID format',
+          details: { id: invalidRoutingConfigId },
+        },
+      });
+      expect(axiosMock.history.length).toBe(0);
     });
   });
 });

lambdas/backend-client/src/routing-config-api-client.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod/v4';
 import type {
   CountSuccess,
   GetV1RoutingConfigurationsCountData,
@@ -16,12 +17,27 @@ import { ErrorCase } from './types/error-cases';
 import { catchAxiosError, createAxiosClient } from './axios-client';
 import { Result } from './types/result';
 import { OpenApiToTemplate } from './types/open-api-helper';
-import { z } from 'zod';
-
-const uuidSchema = z.uuidv4();
 
 export const httpClient = createAxiosClient();
 
+function parseId(id: string): Result<string> {
+  const { success, data } = z.uuidv4().safeParse(id);
+
+  if (!success) {
+    return {
+      error: {
+        errorMeta: {
+          code: ErrorCase.VALIDATION_FAILED,
+          description: 'Invalid routing configuration ID format',
+          details: { id },
+        },
+      },
+    };
+  }
+
+  return { data };
+}
+
 export const routingConfigurationApiClient = {
   async create(
     routingConfig: CreateUpdateRoutingConfig,
@@ -75,17 +91,10 @@ export const routingConfigurationApiClient = {
     token: string,
     id: RoutingConfig['id']
   ): Promise<Result<RoutingConfig>> {
-    if (!uuidSchema.safeParse(id).success) {
-      return {
-        error: {
-          errorMeta: {
-            code: ErrorCase.VALIDATION_FAILED,
-            description: 'Invalid routing configuration ID format',
-            details: { id },
-          },
-          actualError: undefined,
-        },
-      };
+    const parseResult = parseId(id);
+
+    if (parseResult.error) {
+      return parseResult;
     }
 
     const url = `/v1/routing-configuration/${id}` satisfies OpenApiToTemplate<
@@ -127,18 +136,12 @@ export const routingConfigurationApiClient = {
     id: RoutingConfig['id'],
     routingConfig: CreateUpdateRoutingConfig
   ): Promise<Result<RoutingConfig>> {
-    if (!uuidSchema.safeParse(id).success) {
-      return {
-        error: {
-          errorMeta: {
-            code: ErrorCase.VALIDATION_FAILED,
-            description: 'Invalid routing configuration ID format',
-            details: { id },
-          },
-          actualError: undefined,
-        },
-      };
+    const parseResult = parseId(id);
+
+    if (parseResult.error) {
+      return parseResult;
     }
+
     const url = `/v1/routing-configuration/${id}` satisfies OpenApiToTemplate<
       PutV1RoutingConfigurationByRoutingConfigIdData['url']
     >;
@@ -157,21 +160,27 @@ export const routingConfigurationApiClient = {
   },
 
   async submit(id: string, token: string): Promise<Result<RoutingConfig>> {
+    const parseResult = parseId(id);
+
+    if (parseResult.error) {
+      return parseResult;
+    }
+
     const url =
       `/v1/routing-configuration/${id}/submit` satisfies OpenApiToTemplate<
         PatchV1RoutingConfigurationByRoutingConfigIdSubmitData['url']
       >;
 
-    const result = await catchAxiosError(
+    const { error, data } = await catchAxiosError(
       httpClient.patch<RoutingConfigSuccess>(url, null, {
         headers: { Authorization: token },
       })
     );
 
-    if (result.error) {
-      return result;
+    if (error) {
+      return { error };
     }
 
-    return result.data;
+    return { ...data };
   },
 };