From 986e23056d22ecdbcbe9cea31f3e599d2118bccd Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Fri, 22 Sep 2023 11:51:23 +0100 Subject: [PATCH 1/4] fixed access to realm --- js/apps/admin-ui/src/user/CreateUser.tsx | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/js/apps/admin-ui/src/user/CreateUser.tsx b/js/apps/admin-ui/src/user/CreateUser.tsx index 580f0587f1a5..8ee08d0e2192 100644 --- a/js/apps/admin-ui/src/user/CreateUser.tsx +++ b/js/apps/admin-ui/src/user/CreateUser.tsx @@ -19,6 +19,8 @@ import { UserFormFields, toUserRepresentation } from "./form-state"; import { toUser } from "./routes/User"; import "./user-section.css"; +import RealmRepresentation from "libs/keycloak-admin-client/lib/defs/realmRepresentation"; +import { useFetch } from "../utils/useFetch"; export default function CreateUser() { const { t } = useTranslation(); @@ -28,6 +30,15 @@ export default function CreateUser() { const userForm = useForm({ mode: "onChange" }); const [addedGroups, setAddedGroups] = useState([]); + const [realmRepresentation, setRealmRepresentation] = + useState(); + + useFetch( + () => adminClient.realms.findOne({ realm }), + (result) => setRealmRepresentation(result), + [], + ); + const save = async (data: UserFormFields) => { try { const createdUser = await adminClient.users.create({ @@ -57,7 +68,11 @@ export default function CreateUser() { - + From d62c16da1005113490a24b9a5aa60f5570b6a680 Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Fri, 22 Sep 2023 13:30:03 +0100 Subject: [PATCH 2/4] added extra check for the existence of userProfileMetadata --- js/apps/admin-ui/src/user/UserForm.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/apps/admin-ui/src/user/UserForm.tsx b/js/apps/admin-ui/src/user/UserForm.tsx index afbedb7bcc77..8846133d7e88 100644 --- a/js/apps/admin-ui/src/user/UserForm.tsx +++ b/js/apps/admin-ui/src/user/UserForm.tsx @@ -182,7 +182,6 @@ export const UserForm = ({ filterGroups={selectedGroups} /> )} - {isUserProfileEnabled && } {user?.id && ( <> @@ -224,8 +223,8 @@ export const UserForm = ({ )} - {isUserProfileEnabled ? ( - + {isUserProfileEnabled && user?.userProfileMetadata ? ( + ) : ( <> {!realm?.registrationEmailAsUsername && ( From 594f03dda0d87a6290102169e28f59db697905da Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Fri, 22 Sep 2023 16:12:53 +0100 Subject: [PATCH 3/4] fixed editing user and user attributes --- js/apps/admin-ui/src/user/EditUser.tsx | 6 +++++- js/apps/admin-ui/src/user/UserForm.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx index b0d2b8d37620..e4a090a9eccf 100644 --- a/js/apps/admin-ui/src/user/EditUser.tsx +++ b/js/apps/admin-ui/src/user/EditUser.tsx @@ -124,7 +124,11 @@ export default function EditUser() { try { await adminClient.users.update( { id: user!.id! }, - toUserRepresentation(data), + { + ...data, + username: data.username?.trim(), + attributes: { ...user?.attributes, ...data.attributes }, + }, ); addAlert(t("userSaved"), AlertVariant.success); refresh(); diff --git a/js/apps/admin-ui/src/user/UserForm.tsx b/js/apps/admin-ui/src/user/UserForm.tsx index 8846133d7e88..02cb70480c3f 100644 --- a/js/apps/admin-ui/src/user/UserForm.tsx +++ b/js/apps/admin-ui/src/user/UserForm.tsx @@ -224,7 +224,7 @@ export const UserForm = ({ )} {isUserProfileEnabled && user?.userProfileMetadata ? ( - + ) : ( <> {!realm?.registrationEmailAsUsername && ( From 1740802e0bf5dee349f5454827d2facac00eca49 Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Fri, 22 Sep 2023 17:43:08 +0100 Subject: [PATCH 4/4] removed edit related fix to move it to a seprate PR --- js/apps/admin-ui/src/user/CreateUser.tsx | 2 +- js/apps/admin-ui/src/user/EditUser.tsx | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/js/apps/admin-ui/src/user/CreateUser.tsx b/js/apps/admin-ui/src/user/CreateUser.tsx index 8ee08d0e2192..24afc2224e03 100644 --- a/js/apps/admin-ui/src/user/CreateUser.tsx +++ b/js/apps/admin-ui/src/user/CreateUser.tsx @@ -19,7 +19,7 @@ import { UserFormFields, toUserRepresentation } from "./form-state"; import { toUser } from "./routes/User"; import "./user-section.css"; -import RealmRepresentation from "libs/keycloak-admin-client/lib/defs/realmRepresentation"; +import RealmRepresentation from "@keycloak/keycloak-admin-client/lib/defs/realmRepresentation"; import { useFetch } from "../utils/useFetch"; export default function CreateUser() { diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx index e4a090a9eccf..b0d2b8d37620 100644 --- a/js/apps/admin-ui/src/user/EditUser.tsx +++ b/js/apps/admin-ui/src/user/EditUser.tsx @@ -124,11 +124,7 @@ export default function EditUser() { try { await adminClient.users.update( { id: user!.id! }, - { - ...data, - username: data.username?.trim(), - attributes: { ...user?.attributes, ...data.attributes }, - }, + toUserRepresentation(data), ); addAlert(t("userSaved"), AlertVariant.success); refresh();