feat: add 2FA status column to organization members table

devin-ai-integration[bot] · joeauyeung · devin-ai-integration[bot] · commit 3236e0c5d929 · 2025-07-16T16:33:46.000Z
- Add twoFactorEnabled column to UserListTable with admin-only visibility
- Modify backend handler to conditionally include 2FA data for org admins
- Set column as hidden by default using initalColumnVisibility
- Use Badge component to display enabled/disabled status
- Implement proper permission checks using adminOrOwner variable

Co-Authored-By: joe@cal.com &lt;j.auyeung419@gmail.com&gt;
diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/packages/features/users/components/UserTable/UserListTable.tsx
@@ -77,6 +77,7 @@ const initalColumnVisibility = {
   teams: true,
   createdAt: false,
   updatedAt: false,
+  twoFactorEnabled: false,
   actions: true,
 };
 
@@ -416,6 +417,26 @@ function UserListTableContent({ org, attributes, teams, facetedTeamValues }: Use
         },
         cell: ({ row }) => <div>{row.original.updatedAt || ""}</div>,
       },
+      {
+        id: "twoFactorEnabled",
+        accessorKey: "twoFactorEnabled",
+        header: t("2fa"),
+        enableHiding: true,
+        enableSorting: false,
+        enableColumnFilter: false,
+        size: 80,
+        cell: ({ row }) => {
+          const { twoFactorEnabled } = row.original;
+          if (!adminOrOwner || twoFactorEnabled === undefined) {
+            return null;
+          }
+          return (
+            <Badge variant={twoFactorEnabled ? "green" : "gray"}>
+              {twoFactorEnabled ? t("enabled") : t("disabled")}
+            </Badge>
+          );
+        },
+      },
       {
         id: "actions",
         enableHiding: false,
diff --git a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts
@@ -225,6 +225,7 @@ export const listMembersHandler = async ({ ctx, input }: GetOptions) => {
           disableImpersonation: true,
           completedOnboarding: true,
           lastActiveAt: true,
+          ...(ctx.user.organization.isOrgAdmin && { twoFactorEnabled: true }),
           teams: {
             select: {
               team: {
@@ -311,6 +312,7 @@ export const listMembersHandler = async ({ ctx, input }: GetOptions) => {
               .toLowerCase()
           : null,
         avatarUrl: user.avatarUrl,
+        ...(ctx.user.organization.isOrgAdmin && { twoFactorEnabled: user.twoFactorEnabled }),
         teams: user.teams
           .filter((team) => team.team.id !== organizationId) // In this context we dont want to return the org team
           .map((team) => {
