Skip to content

feat(sdk): use SetOrganizationMemberRole RPC for member role changes #1477

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
whoAbhishekSah merged 1 commit into from
Mar 25, 2026
Merged

feat(sdk): use SetOrganizationMemberRole RPC for member role changes #1477

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
26 changes: 24 additions & 2 deletions web/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"@connectrpc/connect-query": "2.1.1",
"@connectrpc/connect-web": "2.1.1",
"@hookform/resolvers": "^3.10.0",
"@raystack/proton": "0.1.0-d8accdc231fe7e3b23b38c0535b2aa92da42cf24",
"@raystack/proton": "0.1.0-dcca57385227df0690df54d66f73b3baacfc580d",
"@tanstack/react-query": "^5.90.2",
"@tanstack/react-router": "1.58.17",
"axios": "^1.9.0",
Expand Down
86 changes: 12 additions & 74 deletions web/sdk/react/views/members/member-columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ import {
DropdownMenu,
DataTableColumnDef
} from '@raystack/apsara';
import type { Role, Policy } from '@raystack/proton/frontier';
import type { Role } from '@raystack/proton/frontier';
import { differenceWith, getInitials, isEqualById } from '~/utils';
import { useMutation, useQuery } from '@connectrpc/connect-query';
import { useMutation } from '@connectrpc/connect-query';
import {
FrontierServiceQueries,
DeletePolicyRequestSchema,
CreatePolicyRequestSchema,
ListPoliciesRequestSchema
SetOrganizationMemberRoleRequestSchema
} from '@raystack/proton/frontier';
import { create } from '@bufbuild/protobuf';
import type { MemberWithInvite } from '~/react/hooks/useOrganizationMembers';
Expand Down Expand Up @@ -129,88 +127,31 @@ const MembersActions = ({
refetch: () => void;
onRemoveMember?: MembersTableType['onRemoveMember'];
}) => {
// Query to fetch policies for the current member
const [isMenuOpen, setIsMenuOpen] = useState(false);

const { data: policiesData, refetch: refetchPolicies } = useQuery(
FrontierServiceQueries.listPolicies,
create(ListPoliciesRequestSchema, {
orgId: organizationId,
userId: member.id
}),
{
enabled: isMenuOpen && !!member.id,
staleTime: 60_000,
gcTime: 300_000
}
);

const { mutateAsync: deletePolicy } = useMutation(
FrontierServiceQueries.deletePolicy,
{
onError: (error: any) => {
toast.error('Something went wrong', {
description: error?.message || 'Failed to delete policy'
});
}
}
);

const { mutateAsync: createPolicy } = useMutation(
FrontierServiceQueries.createPolicy,
const { mutateAsync: setMemberRole } = useMutation(
FrontierServiceQueries.setOrganizationMemberRole,
{
onSuccess: () => {
refetch();
toast.success('Member role updated');
},
onError: (error: any) => {
toast.error('Something went wrong', {
description: error?.message || 'Failed to create policy'
description: error?.message || 'Failed to update member role'
});
}
}
);

async function updateRole(role: Role) {
try {
const resource = `app/organization:${organizationId}`;
const principal = `app/user:${member?.id}`;

// Use policies from Connect RPC query
const policies = policiesData?.policies || [];

// Delete existing policies with individual error handling
const deleteResults = await Promise.allSettled(
policies.map((p: Policy) => {
const req = create(DeletePolicyRequestSchema, {
id: p.id as string
});
return deletePolicy(req);
})
);

// Check for delete errors
const deleteErrors = deleteResults
.filter(
(result): result is PromiseRejectedResult =>
result.status === 'rejected'
)
.map(result => result.reason);

if (deleteErrors.length > 0) {
console.warn('Some policy deletions failed:', deleteErrors);
}

// Create new policy
const createReq = create(CreatePolicyRequestSchema, {
body: {
roleId: role.id as string,
title: role.name as string,
resource: resource,
principal: principal
}
const req = create(SetOrganizationMemberRoleRequestSchema, {
orgId: organizationId,
userId: member?.id,
roleId: role.id as string
});
await createPolicy(createReq);
await setMemberRole(req);
} catch (error: any) {
toast.error('Something went wrong', {
description: error?.message || 'Failed to update member role'
Expand All @@ -222,10 +163,7 @@ const MembersActions = ({
<DropdownMenu
placement="bottom-end"
open={isMenuOpen}
onOpenChange={(open: boolean) => {
setIsMenuOpen(open);
if (open) refetchPolicies();
}}
onOpenChange={setIsMenuOpen}
>
<DropdownMenu.Trigger asChild style={{ cursor: 'pointer' }}>
<DotsHorizontalIcon />
Expand Down
Loading