useCallback fix & use of safeParseJSON (#8396)

* remove extraConfig from useCallback dep * safeParseJSON * fix
dust-tt · Oct 31, 2024 · 6fda99a · 6fda99a
1 parent 010987b
commit 6fda99a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/front/components/data_source/CreateConnectionConfirmationModal.tsx b/front/components/data_source/CreateConnectionConfirmationModal.tsx
@@ -28,13 +28,16 @@ export function CreateConnectionConfirmationModal({
   const [isLoading, setIsLoading] = useState(false);
   const [extraConfig, setExtraConfig] = useState<Record<string, string>>({});
 
-  const isExtraConfigValid = useCallback(() => {
-    if (connectorProviderConfiguration.connectorProvider === "zendesk") {
-      return isValidZendeskSubdomain(extraConfig.zendesk_subdomain);
-    } else {
-      return true;
-    }
-  }, [connectorProviderConfiguration.connectorProvider, extraConfig]);
+  const isExtraConfigValid = useCallback(
+    (extraConfig: Record<string, string>) => {
+      if (connectorProviderConfiguration.connectorProvider === "zendesk") {
+        return isValidZendeskSubdomain(extraConfig.zendesk_subdomain);
+      } else {
+        return true;
+      }
+    },
+    [connectorProviderConfiguration.connectorProvider]
+  );
 
   useEffect(() => {
     if (isOpen) {
@@ -143,7 +146,7 @@ export function CreateConnectionConfirmationModal({
                   setIsLoading(true);
                   onConfirm(extraConfig);
                 }}
-                disabled={!isExtraConfigValid() || isLoading}
+                disabled={!isExtraConfigValid(extraConfig) || isLoading}
                 label={
                   isLoading
                     ? "Connecting..."

diff --git a/front/pages/w/[wId]/oauth/[provider]/setup.tsx b/front/pages/w/[wId]/oauth/[provider]/setup.tsx
@@ -1,4 +1,4 @@
-import { isOAuthProvider, isOAuthUseCase } from "@dust-tt/types";
+import { isOAuthProvider, isOAuthUseCase, safeParseJSON } from "@dust-tt/types";
 import { isLeft } from "fp-ts/lib/Either";
 import * as t from "io-ts";
 
@@ -30,21 +30,19 @@ export const getServerSideProps = withDefaultUserAuthRequirements<object>(
     }
 
     let parsedExtraConfig: Record<string, string> = {};
-    try {
-      const bodyValidation = ExtraConfigTypeSchema.decode(
-        JSON.parse(extraConfig as string)
-      );
-      if (isLeft(bodyValidation)) {
-        return {
-          notFound: true,
-        };
-      }
-      parsedExtraConfig = bodyValidation.right;
-    } catch (e) {
+    const parseRes = safeParseJSON(extraConfig as string);
+    if (parseRes.isErr()) {
       return {
         notFound: true,
       };
     }
+    const bodyValidation = ExtraConfigTypeSchema.decode(parseRes.value);
+    if (isLeft(bodyValidation)) {
+      return {
+        notFound: true,
+      };
+    }
+    parsedExtraConfig = bodyValidation.right;
 
     const urlRes = await createConnectionAndGetSetupUrl(
       auth,