Skip to content

fix: align organization role display and invite authorization with membership owner role #1642

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

Open
DaveMiscampbell wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: align organization role display and invite authorization with membership owner role #1642

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db2c812
fix/org-owner-membership-invite-role: fix: align organization owner r…
DaveMiscampbell Mar 3, 2026
fb923ba
fix/org-owner-membership-invite-role: fix: unify org owner-role autho…
DaveMiscampbell Mar 3, 2026
52b90aa
fix/org-owner-membership-invite-role: fix: address remaining org owne…
DaveMiscampbell Mar 3, 2026
4025b53
fix/org-owner-membership-invite-role: improve: tighten organization e…
DaveMiscampbell Mar 3, 2026
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
14 changes: 13 additions & 1 deletion apps/web/actions/organization/send-invites.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,19 @@ export async function sendOrganizationInvites(
throw new Error("Organization not found");
}

if (organization.ownerId !== user.id) {
const [ownerMembership] = await db()
.select({ id: organizationMembers.id })
.from(organizationMembers)
.where(
and(
eq(organizationMembers.organizationId, organizationId),
eq(organizationMembers.userId, user.id),
eq(organizationMembers.role, "owner"),
),
)
.limit(1);

if (!ownerMembership) {
throw new Error("Only the organization owner can send invites");
}

Expand Down
5 changes: 4 additions & 1 deletion apps/web/app/(org)/dashboard/_components/Navbar/MemberAvatars.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ export function MemberAvatars() {
const { activeOrganization, sidebarCollapsed, setInviteDialogOpen, user } =
useDashboardContext();

const isOwner = user?.id === activeOrganization?.organization.ownerId;
const isOwner =
activeOrganization?.members?.some(
(member) => member.userId === user?.id && member.role === "owner",
) ?? false;

if (sidebarCollapsed) return null;

Expand Down
5 changes: 4 additions & 1 deletion apps/web/app/(org)/dashboard/settings/organization/billing/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import { SeatManagementCard } from "../components/SeatManagementCard";
export default function BillingAndMembersPage() {
const { activeOrganization, user, setInviteDialogOpen } =
useDashboardContext();
const isOwner = user?.id === activeOrganization?.organization.ownerId;
const isOwner =
activeOrganization?.members?.some(
(member) => member.userId === user?.id && member.role === "owner",
) ?? false;
const ownerToastShown = useRef(false);

const showOwnerToast = useCallback(() => {
Expand Down
6 changes: 3 additions & 3 deletions apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ export const MembersCard = ({
setConfirmOpen(true);
};

const isMemberOwner = (id: string) => {
return id === activeOrganization?.organization.ownerId;
const isMemberOwner = (role: string) => {
return role === "owner";
};

return (
Expand Down Expand Up @@ -204,7 +204,7 @@ export const MembersCard = ({
</TableHeader>
<TableBody>
{activeOrganization?.members?.map((member) => {
const memberIsOwner = isMemberOwner(member.user.id);
const memberIsOwner = isMemberOwner(member.role);
return (
<TableRow key={member.id}>
<TableCell>{member.user.name}</TableCell>
Expand Down