added user in role for client tab (#987)

Co-authored-by: Jon Koops <jonkoops@gmail.com>
This commit is contained in:
Erik Jan de Wit 2021-08-11 13:44:18 +02:00 committed by GitHub
parent a6d38096b7
commit 9ce3f2c53c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,25 +9,34 @@ import { KeycloakDataTable } from "../components/table-toolbar/KeycloakDataTable
import { useAdminClient } from "../context/auth/AdminClient"; import { useAdminClient } from "../context/auth/AdminClient";
import { useRealm } from "../context/realm-context/RealmContext"; import { useRealm } from "../context/realm-context/RealmContext";
import { emptyFormatter, upperCaseFormatter } from "../util"; import { emptyFormatter, upperCaseFormatter } from "../util";
import type { ClientRoleParams } from "./routes/ClientRole";
export const UsersInRoleTab = () => { export const UsersInRoleTab = () => {
const history = useHistory(); const history = useHistory();
const { realm } = useRealm(); const { realm } = useRealm();
const { t } = useTranslation("roles"); const { t } = useTranslation("roles");
const { id, clientId } = useParams<ClientRoleParams>();
const { id } = useParams<{ id: string }>();
const adminClient = useAdminClient(); const adminClient = useAdminClient();
const loader = async (first?: number, max?: number) => { const loader = async (first?: number, max?: number) => {
const role = await adminClient.roles.findOneById({ id: id }); const role = await adminClient.roles.findOneById({ id: id });
const usersWithRole = await adminClient.roles.findUsersWithRole({
if (role.clientRole) {
return adminClient.clients.findUsersWithRole({
roleName: role.name!,
id: clientId,
first,
max,
});
}
return adminClient.roles.findUsersWithRole({
name: role.name!, name: role.name!,
first: first!, first,
max: max!, max,
}); });
return usersWithRole || [];
}; };
const { enabled } = useHelp(); const { enabled } = useHelp();