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

Added workaround for overlapping property (#2654)

Browse source
This commit is contained in:
Erik Jan de Wit 2022-05-19 15:44:08 +02:00 committed by GitHub
parent 8b08a43af1
commit 991393ddc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clients/ClientDetails.tsx
View file

@ -249,6 +249,11 @@ export default function ClientDetails() {
) )
); );
} }
Object.entries(client.attributes || {})
.filter(([key]) => key.startsWith("saml.server.signature"))
.map(([key, value]) =>
form.setValue("attributes." + key.replaceAll(".", "$"), value)
);
}; };
useFetch( useFetch(
@ -290,6 +295,13 @@ export default function ClientDetails() {
const submittedClient = const submittedClient =
convertFormValuesToObject<ClientRepresentation>(values); convertFormValuesToObject<ClientRepresentation>(values);
Object.entries(values.attributes || {})
.filter(([key]) => key.includes("$"))
.map(
([key, value]) =>
(submittedClient.attributes![key.replaceAll("$", ".")] = value)
);
if (submittedClient.attributes?.["acr.loa.map"]) { if (submittedClient.attributes?.["acr.loa.map"]) {
submittedClient.attributes["acr.loa.map"] = JSON.stringify( submittedClient.attributes["acr.loa.map"] = JSON.stringify(
keyValueToArray(submittedClient.attributes["acr.loa.map"]) keyValueToArray(submittedClient.attributes["acr.loa.map"])

17
src/clients/add/SamlSignature.tsx
View file

@ -25,21 +25,18 @@ const SIGNATURE_ALGORITHMS = [
const KEYNAME_TRANSFORMER = ["NONE", "KEY_ID", "CERT_SUBJECT"] as const; const KEYNAME_TRANSFORMER = ["NONE", "KEY_ID", "CERT_SUBJECT"] as const;
const CANONICALIZATION = [ const CANONICALIZATION = [
{ { name: "EXCLUSIVE", value: "http://www.w3.org/2001/10/xml-exc-c14n#" },
name: "EXCLUSIVE",
value: "https://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/",
},
{ {
name: "EXCLUSIVE_WITH_COMMENTS", name: "EXCLUSIVE_WITH_COMMENTS",
value: "https://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/#WithComments", value: "http://www.w3.org/2001/10/xml-exc-c14n#WithComments",
}, },
{ {
name: "INCLUSIVE", name: "INCLUSIVE",
value: "https://www.w3.org/TR/2001/REC-xml-c14n-20010315", value: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315",
}, },
{ {
name: "INCLUSIVE_WITH_COMMENTS", name: "INCLUSIVE_WITH_COMMENTS",
value: "https://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments", value: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments",
}, },
] as const; ] as const;
@ -51,7 +48,7 @@ export const SamlSignature = () => {
const { control, watch } = useFormContext<ClientRepresentation>(); const { control, watch } = useFormContext<ClientRepresentation>();
const signDocs = watch("attributes.saml.server.signature"); const signDocs = watch("attributes.saml$server$signature");
const signAssertion = watch("attributes.saml.assertion.signature"); const signAssertion = watch("attributes.saml.assertion.signature");
return ( return (
@ -60,7 +57,7 @@ export const SamlSignature = () => {
role="manage-clients" role="manage-clients"
className="keycloak__capability-config__form" className="keycloak__capability-config__form"
> >
<Toggle name="attributes.saml.server.signature" label="signDocuments" /> <Toggle name="attributes.saml$server$signature" label="signDocuments" />
<Toggle <Toggle
name="attributes.saml.assertion.signature" name="attributes.saml.assertion.signature"
label="signAssertions" label="signAssertions"
@ -117,7 +114,7 @@ export const SamlSignature = () => {
} }
> >
<Controller <Controller
name="attributes.saml.server.signature.keyinfo.xmlSigKeyInfoKeyNameTransformer" name="attributes.saml$server$signature$keyinfo$xmlSigKeyInfoKeyNameTransformer"
defaultValue={KEYNAME_TRANSFORMER[0]} defaultValue={KEYNAME_TRANSFORMER[0]}
control={control} control={control}
render={({ onChange, value }) => ( render={({ onChange, value }) => (