Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Backport to update realm when changing bind #31212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agagancarczyk merged 1 commit into from
Jul 11, 2024
+7 −10
Merged

Backport to update realm when changing bind #31212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions js/apps/admin-ui/src/authentication/AuthenticationSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,7 @@ export default function AuthenticationSection() {
{
name: "usedBy",
displayKey: "usedBy",
cellRenderer: (row) => (
<UsedBy authType={row} realm={realm} />
),
cellRenderer: (row) => <UsedBy authType={row} />,
},
{
name: "description",
Expand Down
5 changes: 2 additions & 3 deletions js/apps/admin-ui/src/authentication/BindFlowDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,15 @@ export const BindFlowDialog = ({ flowAlias, onClose }: BindFlowDialogProps) => {
const { t } = useTranslation();
const form = useForm<BindingForm>();
const { addAlert, addError } = useAlerts();
const { realm } = useRealm();
const { realm, realmRepresentation: realmRep, refresh } = useRealm();

const onSubmit = async ({ bindingType }: BindingForm) => {
const realmRep = await adminClient.realms.findOne({ realm });

try {
await adminClient.realms.update(
{ realm },
{ ...realmRep, [bindingType]: flowAlias },
);
refresh();
addAlert(t("updateFlowSuccess"), AlertVariant.success);
} catch (error) {
addError("updateFlowError", error);
Expand Down
8 changes: 4 additions & 4 deletions js/apps/admin-ui/src/authentication/components/UsedBy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import RealmRepresentation from "@keycloak/keycloak-admin-client/lib/defs/realmRepresentation";
import {
Button,
Modal,
Expand All @@ -17,10 +16,10 @@ import useToggle from "../../utils/useToggle";
import { AuthenticationType, REALM_FLOWS } from "../AuthenticationSection";

import style from "./used-by.module.css";
import { useRealm } from "../../context/realm-context/RealmContext";

type UsedByProps = {
authType: AuthenticationType;
realm: RealmRepresentation;
};

const Label = ({ label }: { label: string }) => (
Expand Down Expand Up @@ -96,11 +95,12 @@ const UsedByModal = ({ id, isSpecificClient, onClose }: UsedByModalProps) => {
);
};

export const UsedBy = ({ authType: { id, usedBy }, realm }: UsedByProps) => {
export const UsedBy = ({ authType: { id, usedBy } }: UsedByProps) => {
const { t } = useTranslation();
const { realmRepresentation: realm } = useRealm();
const [open, toggle] = useToggle();

const key = Object.entries(realm).find(
const key = Object.entries(realm!).find(
(e) => e[1] === usedBy?.values[0],
)?.[0];

Expand Down