From abf2595ffd43e554b2b2727c8c3c8cc710d363d3 Mon Sep 17 00:00:00 2001
From: cgeorgilakis-grnet <cgeorgilakis@admin.grnet.gr>
Date: Mon, 14 Oct 2024 16:49:17 +0300
Subject: [PATCH] fixes

---
 js/apps/admin-ui/src/realm-settings/GeneralTab.tsx          | 1 +
 .../keycloak/broker/saml/SAMLIdentityProviderFactory.java   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx b/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
index 08426522f891..3323086c99c8 100644
--- a/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
@@ -263,6 +263,7 @@ function RealmSettingsGeneralTabForm({
             <Controller
               name="autoUpdatedIdPsInterval"
               control={control}
+              defaultValue={realm.autoUpdatedIdPsInterval}
               render={({ field }) => (
                 <TimeSelector
                   units={["minute", "hour", "day"]}
diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java
index 7c5f05b43765..81623dc1d8e9 100755
--- a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java
+++ b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java
@@ -182,7 +182,11 @@ public IdentityProviderModel parseConfig(KeycloakSession session, String config,
                     }
 
                 }
-                samlIdentityProviderConfig.getConfig().put(LEGACY_HIDE_ON_LOGIN_ATTR, String.valueOf(hideOnLogin));
+                if (samlIdentityProviderConfig.getInternalId() == null) {
+                    samlIdentityProviderConfig.getConfig().put(LEGACY_HIDE_ON_LOGIN_ATTR, String.valueOf(hideOnLogin));
+                } else {
+                    samlIdentityProviderConfig.setHideOnLogin(hideOnLogin);
+                }
 
                 return samlIdentityProviderConfig;
             }