feat: remove health check and add bootUrl field

WebOfTrust · Mar 27, 2024 · d436cb2 · d436cb2
1 parent b6a2a5a
commit d436cb2
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 49 deletions.
diff --git a/src/_locales/en.json b/src/_locales/en.json
@@ -23,6 +23,8 @@
   "action.toSelectOther": "to select other",
   "config.agentUrl.label": "Agent Url:",
   "config.agentUrl.placeholder": "Enter agent url",
+  "config.bootUrl.label": "Boot Url:",
+  "config.bootUrl.placeholder": "Enter boot url",
   "config.error.enterUrl": "Enter a valid url",
   "config.error.invalidAgentUrl": "Invalid agent url",
   "config.error.invalidVendorUrl": "Invalid url, Vendor configuration not found",

diff --git a/src/_locales/es-419.json b/src/_locales/es-419.json
@@ -23,6 +23,8 @@
   "action.toSelectOther": "seleccionar otro",
   "config.agentUrl.label": "URL del agente:",
   "config.agentUrl.placeholder": "Ingrese la URL del agente",
+  "config.bootUrl.label": "URL de inicio:",
+  "config.bootUrl.placeholder": "Ingrese la URL de inicio",
   "config.error.enterUrl": "Introduce una URL válida",
   "config.error.invalidAgentUrl": "URL de agente inválido",
   "config.error.invalidVendorUrl": "URL no válida, configuración del proveedor no encontrada",

diff --git a/src/_locales/es.json b/src/_locales/es.json
@@ -23,6 +23,8 @@
   "action.toSelectOther": "seleccionar otro",
   "config.agentUrl.label": "URL del agente:",
   "config.agentUrl.placeholder": "Ingrese la URL del agente",
+  "config.bootUrl.label": "URL de inicio:",
+  "config.bootUrl.placeholder": "Ingrese la URL de inicio",
   "config.error.enterUrl": "Introduce una URL válida",
   "config.error.invalidAgentUrl": "URL de agente inválido",
   "config.error.invalidVendorUrl": "URL no válida, configuración del proveedor no encontrada",

diff --git a/src/components/ui/input/input.tsx b/src/components/ui/input/input.tsx
@@ -18,6 +18,7 @@ const StyledInputLabel = styled.label`
   font-size: 14px;
   line-height: 20px;
   font-weight: 700;
+  width: fit-content;
 `;
 
 const StyledInput = styled.input<Pick<IInput, "error">>`

diff --git a/src/pages/background/services/config.ts b/src/pages/background/services/config.ts
@@ -92,12 +92,14 @@ const Config = () => {
       CONFIG_ENUMS.VENDOR_URL,
       CONFIG_ENUMS.VENDOR_DATA,
       CONFIG_ENUMS.HAS_ONBOARDED,
+      CONFIG_ENUMS.BOOT_URL,
     ])) as any;
     return {
       vendorUrl: resp[CONFIG_ENUMS.VENDOR_URL],
       agentUrl: resp[CONFIG_ENUMS.AGENT_URL],
       vendorData: resp[CONFIG_ENUMS.VENDOR_DATA],
       hasOnboarded: resp[CONFIG_ENUMS.HAS_ONBOARDED],
+      bootUrl: resp[CONFIG_ENUMS.BOOT_URL],
     };
   };
 

diff --git a/src/pages/popup/Popup.tsx b/src/pages/popup/Popup.tsx
@@ -4,7 +4,7 @@ import {
   WEB_APP_PERMS,
   configService,
 } from "@pages/background/services/config";
-import { isValidUrl, getBootUrl } from "@pages/background/utils";
+import { isValidUrl } from "@pages/background/utils";
 import { ThemeProvider, styled } from "styled-components";
 import { LocaleProvider } from "@src/_locales";
 import { default as defaultVendor } from "@src/config/vendor.json";
@@ -121,12 +121,12 @@ export default function Popup(): JSX.Element {
 
   const handleBootAndConnect = async (passcode: string) => {
     const agentUrl = await configService.getAgentUrl();
+    const bootUrl = await configService.getBootUrl();
     const urlObject = isValidUrl(agentUrl);
 
     if (!urlObject || !urlObject?.origin) return;
     setIsLoading(true);
-
-    const bootUrl = getBootUrl(urlObject.origin);
+
     const { data, error } = await chrome.runtime.sendMessage<
       IMessage<IBootAndConnect>
     >({

diff --git a/src/screens/config/config.tsx b/src/screens/config/config.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { useIntl } from "react-intl";
 import { configService } from "@pages/background/services/config";
 import { useLocale, languageCodeMap } from "@src/_locales";
-import { isValidUrl, getBootUrl, setActionIcon } from "@pages/background/utils";
+import { isValidUrl, setActionIcon } from "@pages/background/utils";
 import { Box, Button, Dropdown, Input, Text, Flex } from "@components/ui";
 
 const langMap = Object.entries(languageCodeMap).map((s) => ({
@@ -16,14 +16,14 @@ export function Config(props: any): JSX.Element {
   const [agentUrl, setAgentUrl] = useState("");
   const [agentUrlError, setAgentUrlError] = useState("");
 
+  const [bootUrl, setBootUrl] = useState("");
+  const [bootUrlError, setBootUrlError] = useState("");
+
   const [hasOnboarded, setHasOnboarded] = useState();
 
   const { formatMessage } = useIntl();
   const { changeLocale, currentLocale } = useLocale();
   const validUrlMsg = formatMessage({ id: "config.error.enterUrl" });
-  const invalidAgentUrlMsg = formatMessage({
-    id: "config.error.invalidAgentUrl",
-  });
   const invalidVendorUrlError = formatMessage({
     id: "config.error.invalidVendorUrl",
   });
@@ -32,6 +32,7 @@ export function Config(props: any): JSX.Element {
     const response = await configService.getAgentAndVendorInfo();
     setVendorUrl(response.vendorUrl);
     setAgentUrl(response.agentUrl);
+    setBootUrl(response.bootUrl);
     setHasOnboarded(response.hasOnboarded);
   };
 
@@ -49,26 +50,11 @@ export function Config(props: any): JSX.Element {
     }
   };
 
-  const checkErrorAgentUrl = async (_url: string) => {
-    const urlObject = isValidUrl(_url);
-    if (!_url || !urlObject) {
+  const handleSetAgentUrl = async (_url: string) => {
+    if (!_url || !isValidUrl(_url)) {
       setAgentUrlError(validUrlMsg);
-      return true;
-    }
-    if (urlObject && urlObject?.origin) {
-      try {
-        const bootUrl = getBootUrl(urlObject.origin);
-        await (await fetch(`${bootUrl}/health`)).json();
-      } catch (error) {
-        setAgentUrlError(invalidAgentUrlMsg);
-        return true;
-      }
+      return;
     }
-  };
-
-  const handleSetAgentUrl = async (_url: string) => {
-    const hasError = await checkErrorAgentUrl(_url);
-    if (hasError) return;
 
     await configService.setAgentUrl(_url);
     setAgentUrl(_url);
@@ -80,13 +66,34 @@ export function Config(props: any): JSX.Element {
     }
   };
 
+  const handleSetBootUrl = async (_url: string) => {
+    if (_url) {
+      if (!isValidUrl(_url)) {
+        setBootUrlError(validUrlMsg);
+        return;
+      }
+
+      await configService.setBootUrl(_url);
+      setBootUrl(_url);
+      setBootUrlError("");
+    } else {
+      await configService.setBootUrl("");
+      setBootUrl("");
+      setBootUrlError("");
+    }
+    props.afterBootUrlUpdate();
+  };
+
   const handleSetVendorUrl = async () => {
     let hasError = checkErrorVendorUrl();
     try {
       const resp = await (await fetch(vendorUrl)).json();
       if (resp?.agentUrl) {
         await handleSetAgentUrl(resp?.agentUrl);
       }
+      if (resp?.bootUrl) {
+        await handleSetBootUrl(resp?.bootUrl);
+      }
       await configService.setVendorData(resp);
       if (resp?.icon) {
         await setActionIcon(resp?.icon);
@@ -108,8 +115,10 @@ export function Config(props: any): JSX.Element {
   };
 
   const handleBack = async () => {
-    const hasError = await checkErrorAgentUrl(agentUrl);
-    if (hasError) return;
+    if (!agentUrl || !isValidUrl(agentUrl)) {
+      setAgentUrlError(validUrlMsg);
+      return;
+    }
     props.handleBack();
   };
 
@@ -142,6 +151,17 @@ export function Config(props: any): JSX.Element {
           onBlur={() => handleSetAgentUrl(agentUrl)}
         />
       </Box>
+      <Box paddingX={3}>
+        <Input
+          id="boot_url"
+          label={`${formatMessage({ id: "config.bootUrl.label" })} *`}
+          error={bootUrlError}
+          placeholder={formatMessage({ id: "config.bootUrl.placeholder" })}
+          value={bootUrl}
+          onChange={(e) => setBootUrl(e.target.value)}
+          onBlur={() => handleSetBootUrl(bootUrl)}
+        />
+      </Box>
       <Box paddingX={3}>
         <Dropdown
           label={formatMessage({ id: "config.language.label" })}

diff --git a/src/screens/permission/permission.tsx b/src/screens/permission/permission.tsx
@@ -42,21 +42,6 @@ export function Permission({
     }
   };
 
-  const checkErrorAgentUrl = async (_url: string) => {
-    const urlObject = isValidUrl(_url);
-    if (!_url || !urlObject) {
-      return true;
-    }
-    if (urlObject && urlObject?.origin) {
-      try {
-        const bootUrl = getBootUrl(urlObject.origin);
-        await (await fetch(`${bootUrl}/health`)).json();
-      } catch (error) {
-        return true;
-      }
-    }
-  };
-
   const removePostPermissionFlags = async () => {
     await configService.setWebRequestedPermission(
       WEB_APP_PERMS.SET_VENDOR_URL,
@@ -67,9 +52,14 @@ export function Permission({
       subtype: "unset-action-icon",
     });
   };
+
+  const handleSetBootUrl = async (_url: string) => {
+    if (!isValidUrl(_url)) return;
+    await configService.setBootUrl(_url);
+  };
+
   const handleSetAgentUrl = async (_url: string) => {
-    const hasError = await checkErrorAgentUrl(_url);
-    if (hasError) return;
+    if (!_url || !isValidUrl(_url)) return;
 
     await configService.setAgentUrl(_url);
     await configService.setHasOnboarded(true);
@@ -92,6 +82,10 @@ export function Permission({
         await handleSetAgentUrl(resp?.agentUrl);
       }
 
+      if(resp?.bootUrl) {
+        await handleSetBootUrl(resp?.bootUrl);
+      }
+
       await configService.setVendorData(resp);
       if (resp?.icon) {
         await setActionIcon(resp?.icon);

diff --git a/src/screens/signin/index.tsx b/src/screens/signin/index.tsx
@@ -24,11 +24,11 @@ interface ISignin {
 
 export function Signin(props: ISignin): JSX.Element {
   const { formatMessage } = useIntl();
-  const [hasOnboarded, setHasOnboarded] = useState(false);
+  const [hasAgentAndBootUrls, setHasAgentAndBootUrls] = useState(false);
 
   const checkIfOnboarded = async () => {
-    const _hasOnboarded = await configService.getHasOnboarded();
-    setHasOnboarded(_hasOnboarded);
+    const response = await configService.getAgentAndVendorInfo();
+    setHasAgentAndBootUrls(response.agentUrl && response.bootUrl);
   };
 
   useEffect(() => {
@@ -53,6 +53,7 @@ export function Signin(props: ISignin): JSX.Element {
             props.setShowConfig(false);
             checkIfOnboarded();
           }}
+          afterBootUrlUpdate={checkIfOnboarded}
           afterSetUrl={props?.afterSetUrl}
         />
       ) : (
@@ -63,8 +64,8 @@ export function Signin(props: ISignin): JSX.Element {
           logo={props.logo}
         />
       )}
-      <Box fontSize={0} position="absolute" width="100%" bottom={2}>
-        {hasOnboarded ? (
+      <Box fontSize={0} padding={2} bottom={2}>
+        {hasAgentAndBootUrls ? (
           <Box textAlign="center">
             <NewButton onClick={props.handleSignup} $hoverUnderline>
               {formatMessage({ id: "account.onboard.cta" })}