Commit44beed8

committed

Fix edit org member check

Looks like the resource needs to be organization_member, not user.Also we were not passing through the edit permission to the edit anddelete buttons.

1 parent2fca1d7 commit44beed8Copy full SHA for 44beed8

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,16 +122,16 @@ export const organizationPermissions = (organizationId: string \| undefined) => {`
`122`	`122`	`queryFn:()=>`
`123`	`123`	`API.checkAuthorization({`
`124`	`124`	`checks:{`
`125`		`-viewUsers:{`
	`125`	`+viewMembers:{`
`126`	`126`	`object:{`
`127`		`-resource_type:"user",`
	`127`	`+resource_type:"organization_member",`
`128`	`128`	`organization_id:organizationId,`
`129`	`129`	`},`
`130`	`130`	`action:"read",`
`131`	`131`	`},`
`132`		`-editUsers:{`
	`132`	`+editMembers:{`
`133`	`133`	`object:{`
`134`		`-resource_type:"user",`
	`134`	`+resource_type:"organization_member",`
`135`	`135`	`organization_id:organizationId,`
`136`	`136`	`},`
`137`	`137`	`action:"update",`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ const OrganizationMembersPage: FC = () => {`
`84`	`84`	`<Stack>`
`85`	`85`	`{Boolean(error)&&<ErrorAlerterror={error}/>}`
`86`	`86`
`87`		`-{permissions.editUsers&&(`
	`87`	`+{permissions.editMembers&&(`
`88`	`88`	`<AddOrganizationMember`
`89`	`89`	`isLoading={addMemberMutation.isLoading}`
`90`	`90`	`onSubmit={async(user)=>{`
`@@ -129,7 +129,7 @@ const OrganizationMembersPage: FC = () => {`
`129`	`129`	`allAvailableRoles={organizationRolesQuery.data}`
`130`	`130`	`oidcRoleSyncEnabled={false}`
`131`	`131`	`isLoading={updateMemberRolesMutation.isLoading}`
`132`		`-canEditUsers`
	`132`	`+canEditUsers={permissions.editMembers}`
`133`	`133`	`onEditRoles={async(newRoleNames)=>{`
`134`	`134`	`try{`
`135`	`135`	`awaitupdateMemberRolesMutation.mutateAsync({`
`@@ -145,7 +145,7 @@ const OrganizationMembersPage: FC = () => {`
`145`	`145`	`}}`
`146`	`146`	`/>`
`147`	`147`	`<TableCell>`
`148`		`-{member.user_id!==me.id&&(`
	`148`	`+{member.user_id!==me.id&&permissions.editMembers&&(`
`149`	`149`	`<MoreMenu>`
`150`	`150`	`<MoreMenuTrigger>`
`151`	`151`	`<ThreeDotsButton/>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ const OrganizationSettingsPage: FC = () => {`
`67`	`67`	`// shows on this page but disable the fields, although that could be`
`68`	`68`	`// confusing?`
`69`	`69`	`if(!permissions.editOrganization){`
`70`		`-if(permissions.viewAllMembers){`
	`70`	`+if(permissions.viewMembers){`
`71`	`71`	`return<Navigateto="members"replace/>;`
`72`	`72`	`}elseif(permissions.viewGrousp){`
`73`	`73`	`return<Navigateto="groups"replace/>;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ export const OrganizationSettingsNavigation: FC<`
`196`	`196`	`Organization settings`
`197`	`197`	`</SidebarNavSubItem>`
`198`	`198`	`)}`
`199`		`-{permissionsQuery.data.viewUsers&&(`
	`199`	`+{permissionsQuery.data.viewMembers&&(`
`200`	`200`	`<SidebarNavSubItem`
`201`	`201`	`href={urlForSubpage(organization.name,"members")}`
`202`	`202`	`>`

Comments

(0)