feedback

Author: brendan-kellam

docs/docs/configuration/audit-logs.mdx

@@ -122,8 +122,6 @@ curl --request GET '$SOURCEBOT_URL/api/ee/audit' \
 | `chat.shared_with_users`              | `user` | `chat` |
 | `chat.unshared_with_user`             | `user` | `chat` |
 | `chat.visibility_updated`             | `user` | `chat` |
-| `org.ownership_transfer_failed`       | `user` | `org` |
-| `org.ownership_transferred`           | `user` | `org` |
 | `user.created_ask_chat`               | `user` | `org` |
 | `user.creation_failed`                | `user` | `user` |
 | `user.delete`                         | `user` | `user` |
@@ -144,8 +142,6 @@ curl --request GET '$SOURCEBOT_URL/api/ee/audit' \
 | `user.read`                           | `user` | `user` |
 | `user.signed_in`                      | `user` | `user` |
 | `user.signed_out`                     | `user` | `user` |
-| `org.ownership_transfer_failed`       | `user` | `org` |
-| `org.ownership_transferred`           | `user` | `org` |
 | `org.member_promoted_to_owner`        | `user` | `user` |
 | `org.owner_demoted_to_member`         | `user` | `user` |
 

docs/docs/configuration/auth/roles-and-permissions.mdx

@@ -21,14 +21,30 @@ import LicenseKeyRequired from '/snippets/license-key-required.mdx'
 
 Organizations support multiple owners, allowing you to share administrative responsibilities across your team. Owners can promote members to owner and demote other owners back to member from **Settings -> Members**.
 
+<Frame>
+  <img src="/images/managing_owners.png" alt="Members settings page showing team members and their roles" />
+</Frame>
+
 ### Promoting a member to owner
 
 To promote a member, click the action menu (three dots) next to their name in the members list and select **Promote to owner**. The member will immediately gain full administrative access.
 
+<Frame>
+  <img src="/images/promote_to_owner.png" alt="Dropdown menu showing Promote to owner option for a member" />
+</Frame>
+
 ### Demoting an owner to member
 
 To demote an owner, click the action menu next to their name and select **Demote to member**. Owners can also demote themselves to step down from the role. The last remaining owner of an organization cannot be demoted — at least one owner must exist at all times.
 
+<Frame>
+  <img src="/images/demote_to_member.png" alt="Dropdown menu showing Demote to member option for an owner" />
+</Frame>
+
 ### Leaving an organization as an owner
 
-An owner can leave the organization as long as at least one other owner exists. If you are the last owner, you must promote another member to owner before leaving.
+An owner can leave the organization as long as at least one other owner exists. If you are the last owner, you must promote another member to owner before leaving.
+
+<Frame>
+  <img src="/images/owner_leave_org.png" alt="Dropdown menu showing Leave organization option for an owner" />
+</Frame>

docs/images/demote_to_member.png

@@ -22,7 +22,7 @@ import { createTransport } from "nodemailer";
 import { Octokit } from "octokit";
 import { auth } from "./auth";
 import { getOrgFromDomain } from "./data/org";
-import { decrementOrgSeatCount, getSubscriptionForOrg } from "./ee/features/billing/serverUtils";
+import { getSubscriptionForOrg } from "./ee/features/billing/serverUtils";
 import { IS_BILLING_ENABLED } from "./ee/features/billing/stripe";
 import InviteUserEmail from "./emails/inviteUserEmail";
 import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
@@ -1150,107 +1150,6 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
         }
     }));
 
-/**
- * @deprecated Use `promoteToOwner` and `demoteToMember` from `@/ee/features/userManagement/actions` instead.
- * This function atomically promotes a member to OWNER and demotes the caller to MEMBER.
- * In a multi-owner model, use promoteToOwner (and optionally leaveOrg) for equivalent behavior.
- */
-export const transferOwnership = async (newOwnerId: string, domain: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
-    withAuth((userId) =>
-        withOrgMembership(userId, domain, async ({ org }) => {
-            const currentUserId = userId;
-
-            const failAuditCallback = async (error: string) => {
-                await auditService.createAudit({
-                    action: "org.ownership_transfer_failed",
-                    actor: {
-                        id: currentUserId,
-                        type: "user"
-                    },
-                    target: {
-                        id: org.id.toString(),
-                        type: "org"
-                    },
-                    orgId: org.id,
-                    metadata: {
-                        message: error
-                    }
-                })
-            }
-            if (newOwnerId === currentUserId) {
-                await failAuditCallback("User is already the owner of this org");
-                return {
-                    statusCode: StatusCodes.BAD_REQUEST,
-                    errorCode: ErrorCode.INVALID_REQUEST_BODY,
-                    message: "You're already the owner of this org",
-                } satisfies ServiceError;
-            }
-
-            const newOwner = await prisma.userToOrg.findUnique({
-                where: {
-                    orgId_userId: {
-                        userId: newOwnerId,
-                        orgId: org.id,
-                    },
-                },
-            });
-
-            if (!newOwner) {
-                await failAuditCallback("The user you're trying to make the owner doesn't exist");
-                return {
-                    statusCode: StatusCodes.BAD_REQUEST,
-                    errorCode: ErrorCode.INVALID_REQUEST_BODY,
-                    message: "The user you're trying to make the owner doesn't exist",
-                } satisfies ServiceError;
-            }
-
-            await prisma.$transaction([
-                prisma.userToOrg.update({
-                    where: {
-                        orgId_userId: {
-                            userId: newOwnerId,
-                            orgId: org.id,
-                        },
-                    },
-                    data: {
-                        role: "OWNER",
-                    }
-                }),
-                prisma.userToOrg.update({
-                    where: {
-                        orgId_userId: {
-                            userId: currentUserId,
-                            orgId: org.id,
-                        },
-                    },
-                    data: {
-                        role: "MEMBER",
-                    }
-                })
-            ]);
-
-            await auditService.createAudit({
-                action: "org.ownership_transferred",
-                actor: {
-                    id: currentUserId,
-                    type: "user"
-                },
-                target: {
-                    id: org.id.toString(),
-                    type: "org"
-                },
-                orgId: org.id,
-                metadata: {
-                    message: `Ownership transferred from ${currentUserId} to ${newOwnerId}`
-                }
-            });
-
-            return {
-                success: true,
-            }
-        }, /* minRequiredRole = */ OrgRole.OWNER)
-    ));
-
 export const checkIfOrgDomainExists = async (domain: string): Promise<boolean | ServiceError> => sew(() =>
     withAuth(async () => {
         const org = await prisma.org.findFirst({
@@ -1262,89 +1161,6 @@ export const checkIfOrgDomainExists = async (domain: string): Promise<boolean |
         return !!org;
     }));
 
-export const removeMemberFromOrg = async (memberId: string, domain: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
-    withAuth(async (userId) =>
-        withOrgMembership(userId, domain, async ({ org }) => {
-            const targetMember = await prisma.userToOrg.findUnique({
-                where: {
-                    orgId_userId: {
-                        orgId: org.id,
-                        userId: memberId,
-                    }
-                }
-            });
-
-            if (!targetMember) {
-                return notFound();
-            }
-
-            await prisma.$transaction(async (tx) => {
-                await tx.userToOrg.delete({
-                    where: {
-                        orgId_userId: {
-                            orgId: org.id,
-                            userId: memberId,
-                        }
-                    }
-                });
-
-                if (IS_BILLING_ENABLED) {
-                    const result = await decrementOrgSeatCount(org.id, tx);
-                    if (isServiceError(result)) {
-                        throw result;
-                    }
-                }
-            });
-
-            return {
-                success: true,
-            }
-        }, /* minRequiredRole = */ OrgRole.OWNER)
-    ));
-
-export const leaveOrg = async (domain: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
-    withAuth(async (userId) =>
-        withOrgMembership(userId, domain, async ({ org, userRole }) => {
-            if (userRole === OrgRole.OWNER) {
-                const ownerCount = await prisma.userToOrg.count({
-                    where: {
-                        orgId: org.id,
-                        role: OrgRole.OWNER,
-                    },
-                });
-
-                if (ownerCount <= 1) {
-                    return {
-                        statusCode: StatusCodes.FORBIDDEN,
-                        errorCode: ErrorCode.OWNER_CANNOT_LEAVE_ORG,
-                        message: "You are the last owner of this organization. Promote another member to owner before leaving.",
-                    } satisfies ServiceError;
-                }
-            }
-
-            await prisma.$transaction(async (tx) => {
-                await tx.userToOrg.delete({
-                    where: {
-                        orgId_userId: {
-                            orgId: org.id,
-                            userId: userId,
-                        }
-                    }
-                });
-
-                if (IS_BILLING_ENABLED) {
-                    const result = await decrementOrgSeatCount(org.id, tx);
-                    if (isServiceError(result)) {
-                        throw result;
-                    }
-                }
-            });
-
-            return {
-                success: true,
-            }
-        })
-    ));
 
 export const getOrgMembers = async (domain: string) => sew(() =>
     withAuth(async (userId) =>