Full-stack: Make "Server url" validation conditions consistent across Fleet, update Web Address form validation and submission logic per Fleet best practices (frontend/docs/patterns.md)

changes/27454-validation

@@ -0,0 +1 @@
+- Accept any string for the Fleet web URL

frontend/components/forms/RegistrationForm/FleetDetails/helpers.js

@@ -8,10 +8,6 @@ const validate = (formData) => {
     errors.server_url = "Fleet web address must be completed";
   }
 
-  if (fleetWebAddress && !startsWith(fleetWebAddress, "https://")) {
-    errors.server_url = "Fleet web address must start with https://";
-  }
-
   const valid = !size(errors);
 
   return { valid, errors };

frontend/pages/admin/OrgSettingsPage/cards/WebAddress/WebAddress.tsx

@@ -3,7 +3,6 @@ import React, { useState } from "react";
 import Button from "components/buttons/Button";
 // @ts-ignore
 import InputField from "components/forms/fields/InputField";
-import validUrl from "components/forms/validators/valid_url";
 import SectionHeader from "components/SectionHeader";
 import GitOpsModeTooltipWrapper from "components/GitOpsModeTooltipWrapper";
 
@@ -13,10 +12,6 @@ interface IWebAddressFormData {
   serverURL: string;
 }
 
-interface IWebAddressFormErrors {
-  server_url?: string | null;
-}
-
 const baseClass = "app-config-form";
 
 const WebAddress = ({
@@ -32,22 +27,8 @@ const WebAddress = ({
 
   const { serverURL } = formData;
 
-  const [formErrors, setFormErrors] = useState<IWebAddressFormErrors>({});
-
   const onInputChange = ({ name, value }: IFormField) => {
     setFormData({ ...formData, [name]: value });
-    setFormErrors({});
-  };
-
-  const validateForm = () => {
-    const errors: IWebAddressFormErrors = {};
-    if (!serverURL) {
-      errors.server_url = "Fleet server URL must be present";
-    } else if (!validUrl({ url: serverURL, protocols: ["http", "https"] })) {
-      errors.server_url = `${serverURL} is not a valid URL`;
-    }
-
-    setFormErrors(errors);
   };
 
   const onFormSubmit = (evt: React.MouseEvent<HTMLFormElement>) => {
@@ -79,8 +60,6 @@ const WebAddress = ({
             name="serverURL"
             value={serverURL}
             parseTarget
-            onBlur={validateForm}
-            error={formErrors.server_url}
             tooltip="The base URL of this instance for use in Fleet links."
             disabled={gitOpsModeEnabled}
           />
@@ -90,7 +69,7 @@ const WebAddress = ({
               <Button
                 type="submit"
                 variant="brand"
-                disabled={Object.keys(formErrors).length > 0 || disableChildren}
+                disabled={disableChildren}
                 className="button-wrap"
                 isLoading={isUpdatingSettings}
               >

server/service/validation_setup.go

@@ -2,9 +2,6 @@ package service
 
 import (
 	"context"
-	"errors"
-	"net/url"
-	"strings"
 
 	"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
 	"github.com/fleetdm/fleet/v4/server/fleet"
@@ -28,14 +25,14 @@ func (mw validationMiddleware) NewAppConfig(ctx context.Context, payload fleet.A
 }
 
 func validateServerURL(urlString string) error {
-	serverURL, err := url.Parse(urlString)
-	if err != nil {
-		return err
-	}
+	// serverURL, err := url.Parse(urlString)
+	// if err != nil {
+	// 	return err
+	// }
 
-	if serverURL.Scheme != "https" && !strings.Contains(serverURL.Host, "localhost") {
-		return errors.New("url scheme must be https")
-	}
+	// if serverURL.Scheme != "https" && !strings.Contains(serverURL.Host, "localhost") {
+	// 	return errors.New("url scheme must be https")
+	// }
 
 	return nil
 }