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

Port logout panel to new form controls (#27419)

Browse source 
Signed-off-by: Jon Koops <jonkoops@gmail.com>
This commit is contained in:
Jon Koops 2024-03-05 18:04:47 +01:00 committed by GitHub
parent 96841f8d5b
commit d124b02a95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/apps/admin-ui/cypress/support/pages/admin-ui/manage/clients/CreateClientPage.ts
View file

@ -42,8 +42,8 @@ export default class CreateClientPage extends CommonPage {
#frontChannelLogoutSwitch =
'[for="kc-frontchannelLogout-switch"] > .pf-c-switch__toggle';
#frontChannelLogoutSwitchInput = "#kc-frontchannelLogout-switch";
#frontChannelLogoutInput = "#frontchannelLogoutUrl";
#backChannelLogoutInput = "#backchannelLogoutUrl";
#frontChannelLogoutInput = "frontchannelLogoutUrl";
#backChannelLogoutInput = "backchannelLogoutUrl";
#backChannelLogoutRequiredSwitchInput = "#backchannelLogoutSessionRequired";
#backChannelLogoutRevoqueSwitch =
'.pf-c-form__group-control [for="backchannelLogoutRevokeOfflineSessions"] > .pf-c-switch__toggle';
@ -267,17 +267,17 @@ export default class CreateClientPage extends CommonPage {
checkLogoutSettingsElements() {
cy.get(this.#backChannelLogoutRevoqueSwitch).scrollIntoView();
cy.get(this.#frontChannelLogoutSwitchInput).should("not.be.disabled");
cy.get(this.#frontChannelLogoutInput).should("not.be.disabled");
cy.get(this.#backChannelLogoutInput).should("not.be.disabled");
cy.findByTestId(this.#frontChannelLogoutInput).should("not.be.disabled");
cy.findByTestId(this.#backChannelLogoutInput).should("not.be.disabled");
cy.get(this.#backChannelLogoutRequiredSwitchInput).should(
"not.be.disabled",
);
cy.get(this.#backChannelLogoutRevoqueSwitchInput).should("not.be.disabled");
cy.get(this.#frontChannelLogoutSwitch).click();
cy.get(this.#frontChannelLogoutInput).should("not.exist");
cy.findByTestId(this.#frontChannelLogoutInput).should("not.exist");
cy.get(this.#frontChannelLogoutSwitch).click();
cy.get(this.#frontChannelLogoutInput).should("not.be.disabled");
cy.findByTestId(this.#frontChannelLogoutInput).should("not.be.disabled");
return this;
}

112
js/apps/admin-ui/src/clients/add/LogoutPanel.tsx
View file

@ -1,13 +1,12 @@
import { FormGroup, Switch, ValidatedOptions } from "@patternfly/react-core";
import { FormGroup, Switch } from "@patternfly/react-core";
import { Controller, useFormContext } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { HelpItem } from "ui-shared";
import { HelpItem, TextControl } from "ui-shared";
import { FixedButtonsGroup } from "../../components/form/FixedButtonGroup";
import { FormAccess } from "../../components/form/FormAccess";
import { KeycloakTextInput } from "../../components/keycloak-text-input/KeycloakTextInput";
import { useAccess } from "../../context/access/Access";
import { beerify, convertAttributeNameToForm } from "../../util";
import { convertAttributeNameToForm } from "../../util";
import { FormFields } from "../ClientDetails";
import type { ClientSettingsProps } from "../ClientSettings";
@ -23,12 +22,7 @@ export const LogoutPanel = ({
client: { access },
}: ClientSettingsProps) => {
const { t } = useTranslation();
const {
register,
control,
watch,
formState: { errors },
} = useFormContext<FormFields>();
const { control, watch } = useFormContext<FormFields>();
const { hasAccess } = useAccess();
const isManager = hasAccess("manage-clients") || access?.configure;
@ -70,85 +64,35 @@ export const LogoutPanel = ({
/>
</FormGroup>
{protocol === "openid-connect" && frontchannelLogout && (
<FormGroup
<TextControl
data-testid="frontchannelLogoutUrl"
type="url"
name={convertAttributeNameToForm<FormFields>(
"attributes.frontchannel.logout.url",
)}
label={t("frontchannelLogoutUrl")}
fieldId="frontchannelLogoutUrl"
labelIcon={
<HelpItem
helpText={t("frontchannelLogoutUrlHelp")}
fieldLabelId="frontchannelLogoutUrl"
/>
}
helperTextInvalid={
errors.attributes?.[beerify("frontchannel.logout.url")]
?.message as string
}
validated={
errors.attributes?.[beerify("frontchannel.logout.url")]?.message
? ValidatedOptions.error
: ValidatedOptions.default
}
>
<KeycloakTextInput
id="frontchannelLogoutUrl"
type="url"
{...register(
convertAttributeNameToForm<FormFields>(
"attributes.frontchannel.logout.url",
),
{
validate: (uri) =>
validateUrl(uri, t("frontchannelUrlInvalid").toString()),
},
)}
validated={
errors.attributes?.[beerify("frontchannel.logout.url")]?.message
? ValidatedOptions.error
: ValidatedOptions.default
}
/>
</FormGroup>
labelIcon={t("frontchannelLogoutUrlHelp")}
rules={{
validate: (uri) =>
validateUrl(uri, t("frontchannelUrlInvalid").toString()),
}}
/>
)}
{protocol === "openid-connect" && (
<>
<FormGroup
<TextControl
data-testid="backchannelLogoutUrl"
type="url"
name={convertAttributeNameToForm<FormFields>(
"attributes.backchannel.logout.url",
)}
label={t("backchannelLogoutUrl")}
fieldId="backchannelLogoutUrl"
labelIcon={
<HelpItem
helpText={t("backchannelLogoutUrlHelp")}
fieldLabelId="backchannelLogoutUrl"
/>
}
helperTextInvalid={
errors.attributes?.[beerify("backchannel.logout.url")]
?.message as string
}
validated={
errors.attributes?.[beerify("backchannel.logout.url")]?.message
? ValidatedOptions.error
: ValidatedOptions.default
}
>
<KeycloakTextInput
id="backchannelLogoutUrl"
type="url"
{...register(
convertAttributeNameToForm<FormFields>(
"attributes.backchannel.logout.url",
),
{
validate: (uri) =>
validateUrl(uri, t("backchannelUrlInvalid").toString()),
},
)}
validated={
errors.attributes?.[beerify("backchannel.logout.url")]?.message
? ValidatedOptions.error
: ValidatedOptions.default
}
/>
</FormGroup>
labelIcon={t("backchannelLogoutUrlHelp")}
rules={{
validate: (uri) =>
validateUrl(uri, t("backchannelUrlInvalid").toString()),
}}
/>
<FormGroup
label={t("backchannelLogoutSessionRequired")}
labelIcon={