libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Prevent email settings from being erased when changing realm settings (#21388)

Browse source 
Closes #19746
This commit is contained in:
Tirth Bharatiya 2023-07-07 15:18:20 +05:30 committed by GitHub
parent 04c5ebc759
commit b8d1a9427f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
js/apps/admin-ui/src/realm-settings/EmailTab.tsx
View file

@ -11,7 +11,6 @@ import {
PageSection,
Switch,
} from "@patternfly/react-core";
import { useState } from "react";
import { Controller, useForm, useWatch } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
@ -32,17 +31,18 @@ import "./realm-settings-section.css";
type RealmSettingsEmailTabProps = {
realm: RealmRepresentation;
save: (realm: RealmRepresentation) => void;
};
export const RealmSettingsEmailTab = ({
realm: initialRealm,
realm,
save,
}: RealmSettingsEmailTabProps) => {
const { t } = useTranslation("realm-settings");
const { realm: realmName } = useRealm();
const { addAlert, addError } = useAlerts();
const currentUser = useCurrentUser();
const [realm, setRealm] = useState(initialRealm);
const {
register,
control,
@ -64,21 +64,6 @@ export const RealmSettingsEmailTab = ({
defaultValue: "",
});
const save = async (form: RealmRepresentation) => {
try {
const savedRealm = { ...realm, ...form };
// For default value, back end is expecting null instead of empty string
if (savedRealm.smtpServer?.port === "") savedRealm.smtpServer.port = null;
await adminClient.realms.update({ realm: realmName }, savedRealm);
setRealm(savedRealm);
addAlert(t("saveSuccess"), AlertVariant.success);
} catch (error) {
addError("realm-settings:saveError", error);
}
};
const testConnection = async () => {
const toNumber = (value: string) => Number(value);
const toBoolean = (value: string) => value === true.toString();

21
js/apps/admin-ui/src/realm-settings/RealmSettingsTabs.tsx
View file

@ -199,14 +199,17 @@ export const RealmSettingsTabs = ({
}
try {
await adminClient.realms.update(
{ realm: realmName },
{
...realm,
...r,
id: r.realm,
}
);
const savedRealm: RealmRepresentation = {
...realm,
...r,
id: r.realm,
};
// For the default value, null is expected instead of an empty string.
if (savedRealm.smtpServer?.port === "") {
savedRealm.smtpServer = { ...savedRealm.smtpServer, port: null };
}
await adminClient.realms.update({ realm: realmName }, savedRealm);
addAlert(t("saveSuccess"), AlertVariant.success);
} catch (error) {
addError("realm-settings:saveError", error);
@ -293,7 +296,7 @@ export const RealmSettingsTabs = ({
data-testid="rs-email-tab"
{...emailTab}
>
<RealmSettingsEmailTab realm={realm} />
<RealmSettingsEmailTab realm={realm} save={save} />
</Tab>
<Tab
title={<TabTitleText>{t("themes")}</TabTitleText>}