successful log in loop poc

src/app/[orgId]/settings/access/users/UsersTable.tsx

@@ -24,7 +24,13 @@ import { useUserContext } from "@app/hooks/useUserContext";
 
 export type UserRow = {
     id: string;
-    email: string;
+    email: string | null;
+    displayUsername: string | null;
+    username: string;
+    name: string | null;
+    idpId: number | null;
+    idpName: string;
+    type: string;
     status: string;
     role: string;
     isOwner: boolean;
@@ -82,7 +88,8 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                                                     Manage User
                                                 </DropdownMenuItem>
                                             </Link>
-                                            {userRow.email !== user?.email && (
+                                            {userRow.username !==
+                                                user?.username && (
                                                 <DropdownMenuItem
                                                     onClick={() => {
                                                         setIsDeleteModalOpen(
@@ -108,7 +115,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
             }
         },
         {
-            accessorKey: "email",
+            accessorKey: "displayUsername",
             header: ({ column }) => {
                 return (
                     <Button
@@ -117,14 +124,14 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                             column.toggleSorting(column.getIsSorted() === "asc")
                         }
                     >
-                        Email
+                        Username
                         <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
             }
         },
         {
-            accessorKey: "status",
+            accessorKey: "idpName",
             header: ({ column }) => {
                 return (
                     <Button
@@ -133,7 +140,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                             column.toggleSorting(column.getIsSorted() === "asc")
                         }
                     >
-                        Status
+                        Identity Provider
                         <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
@@ -185,7 +192,10 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                             <Link
                                 href={`/${org?.org.orgId}/settings/access/users/${userRow.id}`}
                             >
-                                <Button variant={"outlinePrimary"} className="ml-2">
+                                <Button
+                                    variant={"outlinePrimary"}
+                                    className="ml-2"
+                                >
                                     Manage
                                     <ArrowRight className="ml-2 w-4 h-4" />
                                 </Button>
@@ -239,7 +249,12 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                     <div className="space-y-4">
                         <p>
                             Are you sure you want to remove{" "}
-                            <b>{selectedUser?.email}</b> from the organization?
+                            <b>
+                                {selectedUser?.email ||
+                                    selectedUser?.name ||
+                                    selectedUser?.username}
+                            </b>{" "}
+                            from the organization?
                         </p>
 
                         <p>
@@ -250,14 +265,19 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                         </p>
 
                         <p>
-                            To confirm, please type the email address of the
-                            user below.
+                            To confirm, please type the name of the of the user
+                            below.
                         </p>
                     </div>
                 }
                 buttonText="Confirm Remove User"
                 onConfirm={removeUser}
-                string={selectedUser?.email ?? ""}
+                string={
+                    selectedUser?.email ||
+                    selectedUser?.name ||
+                    selectedUser?.username ||
+                    ""
+                }
                 title="Remove User from Organization"
             />
 

src/app/[orgId]/settings/access/users/page.tsx

@@ -70,7 +70,13 @@ export default async function UsersPage(props: UsersPageProps) {
     const userRows: UserRow[] = users.map((user) => {
         return {
             id: user.id,
+            username: user.username,
+            displayUsername: user.email || user.name || user.username,
+            name: user.name,
             email: user.email,
+            type: user.type,
+            idpId: user.idpId,
+            idpName: user.idpName || "Internal",
             status: "Confirmed",
             role: user.isOwner ? "Owner" : user.roleName || "Member",
             isOwner: user.isOwner || false

src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx

@@ -45,6 +45,7 @@ import { SwitchInput } from "@app/components/SwitchInput";
 import { InfoPopup } from "@app/components/ui/info-popup";
 import { Tag, TagInput } from "@app/components/tags/tag-input";
 import { useRouter } from "next/navigation";
+import { UserType } from "@server/types/UserTypes";
 
 const UsersRolesFormSchema = z.object({
     roles: z.array(
@@ -175,7 +176,7 @@ export default function ResourceAuthenticationPage() {
                 setAllUsers(
                     usersResponse.data.data.users.map((user) => ({
                         id: user.id.toString(),
-                        text: user.email
+                        text: `${user.email || user.username}${user.type !== UserType.Internal ? ` (${user.idpName})` : ""}`
                     }))
                 );
 
@@ -183,7 +184,7 @@ export default function ResourceAuthenticationPage() {
                     "users",
                     resourceUsersResponse.data.data.users.map((i) => ({
                         id: i.userId.toString(),
-                        text: i.email
+                        text: `${i.email || i.username}${i.type !== UserType.Internal ? ` (${i.idpName})` : ""}`
                     }))
                 );