without tests

js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties

@@ -1043,7 +1043,7 @@ importKeys=Import keys
 useMetadataDescriptorUrl=Use metadata descriptor URL
 useMetadataDescriptorUrlHelp=If the switch is on, the certificates to validate signatures will be downloaded and cached from the given "Metadata descriptor URL". The "Reload keys" action can be used to refresh the certificates in the cache. If the switch is off, certificates from "Validating X509 certificates" option are used, they need to be manually updated when changed in the IDP.
 metadataDescriptorUrl=Metadata descriptor URL
-metadataDescriptorUrlHelp=External URL where Identity Provider publishes the metadata information needed by the client (certificates, keys, other URLs,...).
+metadataDescriptorUrlHelp=External URL where Identity Provider publishes the metadata information needed by the client (certificates, keys, other URLs,...). This url is used for auto-updated IdPs and when use metadata descriptor URL is true.
 reloadKeysSuccess=Keys successfully reloaded
 reloadKeysError=Error reloading keys. {{error}}
 reloadKeysSuccessButFalse=The reload was not executed, maybe the time between request was too short.
@@ -3254,4 +3254,5 @@ eventTypes.REMOVE_CREDENTIAL_ERROR.description=Remove credential error
 autoUpdatedIdPsInterval= Autoupdated Identity Providers execution interval
 autoUpdatedIdPsIntervalHelp= Every how much time autoupdated Identity Providers will be updated based on metadata url
 autoUpdatedIdPsLastRefreshTime= Last execution time of autoupdated Identity Providers task
-autoUpdate= Auto Update",
+autoUpdate= Auto Update
+autoUpdateHelp= When auto update is true, IdP metadata will be updated based on metadata descriptor URL

js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx

@@ -38,6 +38,11 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
     name: "config.validateSignature",
   });
 
+  const autoUpdated = useWatch({
+    control,
+    name: "config.autoUpdate",
+  });
+
   const useMetadataDescriptorUrl = useWatch({
     control,
     name: "config.useMetadataDescriptorUrl",
@@ -51,6 +56,25 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
   return (
     <div className="pf-v5-c-form pf-m-horizontal">
       <FormProvider {...form}>
+        <DefaultSwitchControl
+          name="config.autoUpdate"
+          label={t("autoUpdate")}
+          isDisabled={readOnly}
+          stringify
+        />
+        <TextControl
+          name="config.metadataDescriptorUrl"
+          label={t("metadataDescriptorUrl")}
+          labelIcon={t("metadataDescriptorUrlHelp")}
+          type="url"
+          readOnly={readOnly}
+          rules={{
+            required: {
+              value: useMetadataDescriptorUrl === "true" || autoUpdated === "true",
+              message: t("required"),
+            }
+          }}
+        />
         <TextControl
           name="config.entityId"
           label={t("serviceProviderEntityId")}
@@ -279,19 +303,6 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         />
         {validateSignature === "true" && (
           <>
-            <TextControl
-              name="config.metadataDescriptorUrl"
-              label={t("metadataDescriptorUrl")}
-              labelIcon={t("metadataDescriptorUrlHelp")}
-              type="url"
-              readOnly={readOnly}
-              rules={{
-                required: {
-                  value: useMetadataDescriptorUrl === "true",
-                  message: t("required"),
-                },
-              }}
-            />
             <DefaultSwitchControl
               name="config.useMetadataDescriptorUrl"
               label={t("useMetadataDescriptorUrl")}

js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx

@@ -34,9 +34,32 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
     control,
     name: "config.pkceEnabled",
   });
+  const autoUpdated = useWatch({
+    control,
+    name: "config.autoUpdate",
+  });
 
   return (
     <div className="pf-v5-c-form pf-m-horizontal">
+     <DefaultSwitchControl
+       name="config.autoUpdate"
+       label={t("autoUpdate")}
+       isDisabled={readOnly}
+       stringify
+     />
+     <TextControl
+       name="config.metadataDescriptorUrl"
+       label={t("metadataOfDiscoveryEndpoint")}
+       labelIcon={t("discoveryEndpointHelp")}
+       type="url"
+       readOnly={readOnly}
+       rules={{
+         required: {
+           value: autoUpdated === "true",
+           message: t("required"),
+         }
+       }}
+      />
       <TextControl
         name="config.authorizationUrl"
         label={t("authorizationUrl")}

js/apps/admin-ui/src/identity-providers/component/DiscoveryEndpointField.tsx

@@ -1,10 +1,12 @@
 import { FormGroup, Spinner, Switch } from "@patternfly/react-core";
 import debouncePromise from "p-debounce";
 import { ReactNode, useMemo, useState } from "react";
-import { useFormContext } from "react-hook-form";
+import { useFormContext, useWatch} from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { HelpItem, TextControl } from "@keycloak/keycloak-ui-shared";
 import { useAdminClient } from "../../admin-client";
+import { DefaultSwitchControl } from "../../components/SwitchControl";
+import IdentityProviderRepresentation from "@keycloak/keycloak-admin-client/lib/defs/identityProviderRepresentation";
 
 type DiscoveryEndpointFieldProps = {
   id: string;
@@ -34,7 +36,14 @@ export const DiscoveryEndpointField = ({
     Object.keys(result).map((k) => setValue(`config.${k}`, result[k]));
   };
 
-  const discover = async (fromUrl: string) => {
+  const { control } = useFormContext<IdentityProviderRepresentation>();
+
+  const autoUpdated = useWatch({
+    control,
+    name: "config.autoUpdate",
+  });
+
+ const discover = async (fromUrl: string) => {
     setDiscovering(true);
     try {
       const result = await adminClient.identityProviders.importFromUrl({
@@ -43,13 +52,21 @@ export const DiscoveryEndpointField = ({
       });
       setupForm(result);
       setDiscoveryResult(result);
+      setValue("config.metadataUrl", fromUrl);
     } catch (error) {
       return (error as Error).message;
     } finally {
       setDiscovering(false);
     }
   };
 
+//   useEffect(() => {
+//         if (id === "saml" || id === "oidc") {
+//           setValue("config.metadataUrl", fromUrl);
+//         }
+//       }, [fromUrl]);
+
+
   const discoverDebounced = useMemo(() => debouncePromise(discover, 1000), []);
 
   return (
@@ -116,6 +133,11 @@ export const DiscoveryEndpointField = ({
         />
       )}
       {!discovery && fileUpload}
+      <DefaultSwitchControl
+                name="config.autoUpdate"
+                label={t("autoUpdate")}
+                stringify
+       />
       {discovery && !errors.discoveryError && children(true)}
       {!discovery && children(false)}
     </>

js/apps/admin-ui/src/realm-settings/GeneralTab.tsx

@@ -20,7 +20,7 @@ import {
   StackItem,
 } from "@patternfly/react-core";
 import { useEffect, useState } from "react";
-import { Controller, FormProvider, useForm } from "react-hook-form";
+import { Controller, FormProvider, useForm, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useAdminClient } from "../admin-client";
 import { DefaultSwitchControl } from "../components/SwitchControl";
@@ -36,6 +36,7 @@ import {
 } from "../util";
 import useIsFeatureEnabled, { Feature } from "../utils/useIsFeatureEnabled";
 import { UIRealmRepresentation } from "./RealmSettingsTabs";
+import { TimeSelector } from "../components/time-selector/TimeSelector";
 
 type RealmSettingsGeneralTabProps = {
   realm: UIRealmRepresentation;
@@ -52,14 +53,6 @@ export const RealmSettingsGeneralTab = ({
   const [userProfileConfig, setUserProfileConfig] =
     useState<UserProfileConfig>();
 
-  const autoUpdatedIdPsInterval = useWatch({
-    control,
-    name: "autoUpdatedIdPsInterval",
-    defaultValue: realm.autoUpdatedIdPsInterval,
-  });
-
-  const autoUpdatedIdPsLastRefreshTime = watch("autoUpdatedIdPsLastRefreshTime") as unknown as string;
-
   useFetch(
     () => adminClient.users.getProfile({ realm: realmName }),
     (config) => setUserProfileConfig(config),
@@ -116,9 +109,14 @@ function RealmSettingsGeneralTabForm({
     setValue,
     formState: { errors },
   } = form;
+  const { watch } = useFormContext();
   const isFeatureEnabled = useIsFeatureEnabled();
   const isOrganizationsEnabled = isFeatureEnabled(Feature.Organizations);
 
+  const autoUpdatedIdPsInterval =  watch("autoUpdatedIdPsInterval") as unknown as string;
+
+  const autoUpdatedIdPsLastRefreshTime = watch("autoUpdatedIdPsLastRefreshTime") as unknown as string;
+
   const setupForm = () => {
     convertToFormValues(realm, setValue);
     setValue(
@@ -258,13 +256,10 @@ function RealmSettingsGeneralTabForm({
           >
             <Controller
               name="autoUpdatedIdPsInterval"
-              control={form.control}
+              control={control}
               render={({ field }) => (
                 <TimeSelector
-                  id="autoUpdatedIdPsInterval"
-                  className="auto-updated-idps-interval"
-                  data-testid="auto-updated-idps-interval"
-                  aria-label="auto-updated-idps-interval"
+                  units={["minute", "hour", "day"]}
                   value={field.value}
                   onChange={field.onChange}
                 />

js/libs/keycloak-admin-client/src/defs/realmRepresentation.ts

@@ -26,6 +26,8 @@ export default interface RealmRepresentation {
   adminEventsEnabled?: boolean;
   adminTheme?: string;
   attributes?: Record<string, any>;
+  autoUpdatedIdPsInterval?: number;
+  autoUpdatedIdPsLastRefreshTime?: number;
   // AuthenticationFlowRepresentation
   authenticationFlows?: any[];
   // AuthenticatorConfigRepresentation
@@ -82,8 +84,6 @@ export default interface RealmRepresentation {
   offlineSessionMaxLifespan?: number;
   offlineSessionMaxLifespanEnabled?: boolean;
   organizationsEnabled?: boolean;
-  autoUpdatedIdPsInterval?: number;
-  autoUpdatedIdPsLastRefreshTime?: number;
   otpPolicyAlgorithm?: string;
   otpPolicyDigits?: number;
   otpPolicyInitialCounter?: number;