fix(console): input invalid format content in multitextinput will not…

… crash the app
logto-io · Sep 7, 2022 · 035be48 · 035be48
1 parent 2e0ab89
commit 035be48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/console/src/components/MultiTextInput/types.ts b/packages/console/src/components/MultiTextInput/types.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 export const multiTextInputErrorGuard = z.object({
   required: z.string().optional(),
-  inputs: z.record(z.number(), z.string().optional()).optional(),
+  inputs: z.record(z.number().or(z.string()), z.string().optional()).optional(),
 });
 
 export type MultiTextInputError = z.infer<typeof multiTextInputErrorGuard>;

diff --git a/packages/console/src/components/MultiTextInput/utils.ts b/packages/console/src/components/MultiTextInput/utils.ts
@@ -1,5 +1,7 @@
 import { t } from 'i18next';
 
+import { safeParseJson } from '@/utilities/json';
+
 import { MultiTextInputError, multiTextInputErrorGuard, MultiTextInputRule } from './types';
 
 export const validate = (
@@ -57,7 +59,13 @@ export const convertRhfErrorMessage = (errorMessage?: string): MultiTextInputErr
     return;
   }
 
-  const result = multiTextInputErrorGuard.safeParse(errorMessage);
+  const jsonParseResult = safeParseJson(errorMessage);
+
+  if (!jsonParseResult.success) {
+    throw new Error(t('admin_console.errors.invalid_error_message_format'));
+  }
+
+  const result = multiTextInputErrorGuard.safeParse(jsonParseResult.data);
 
   if (!result.success) {
     throw new Error(t('admin_console.errors.invalid_error_message_format'));