successful log in loop poc

server/routers/user/adminListUsers.ts

@@ -6,7 +6,7 @@ import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
 import { sql, eq } from "drizzle-orm";
 import logger from "@server/logger";
-import { users } from "@server/db/schemas";
+import { idp, users } from "@server/db/schemas";
 import { fromZodError } from "zod-validation-error";
 
 const listUsersSchema = z
@@ -31,10 +31,16 @@ async function queryUsers(limit: number, offset: number) {
         .select({
             id: users.userId,
             email: users.email,
+            username: users.username,
+            name: users.name,
             dateCreated: users.dateCreated,
-            serverAdmin: users.serverAdmin
+            serverAdmin: users.serverAdmin,
+            type: users.type,
+            idpName: idp.name,
+            idpId: users.idpId
         })
         .from(users)
+        .leftJoin(idp, eq(users.idpId, idp.idpId))
         .where(eq(users.serverAdmin, false))
         .limit(limit)
         .offset(offset);

server/routers/user/getOrgUser.ts

@@ -17,6 +17,9 @@ async function queryUser(orgId: string, userId: string) {
             orgId: userOrgs.orgId,
             userId: users.userId,
             email: users.email,
+            username: users.username,
+            name: users.name,
+            type: users.type,
             roleId: userOrgs.roleId,
             roleName: roles.name,
             isOwner: userOrgs.isOwner,

server/routers/user/getUser.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { users } from "@server/db/schemas";
+import { idp, users } from "@server/db/schemas";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -13,11 +13,17 @@ async function queryUser(userId: string) {
         .select({
             userId: users.userId,
             email: users.email,
+            username: users.username,
+            name: users.name,
+            type: users.type,
             twoFactorEnabled: users.twoFactorEnabled,
             emailVerified: users.emailVerified,
-            serverAdmin: users.serverAdmin
+            serverAdmin: users.serverAdmin,
+            idpName: idp.name,
+            idpId: users.idpId
         })
         .from(users)
+        .leftJoin(idp, eq(users.idpId, idp.idpId))
         .where(eq(users.userId, userId))
         .limit(1);
     return user;

server/routers/user/inviteUser.ts

@@ -16,6 +16,7 @@ import { fromError } from "zod-validation-error";
 import { sendEmail } from "@server/emails";
 import SendInviteLink from "@server/emails/templates/SendInviteLink";
 import { OpenAPITags, registry } from "@server/openApi";
+import { UserType } from "@server/types/UserTypes";
 
 const regenerateTracker = new NodeCache({ stdTTL: 3600, checkperiod: 600 });
 
@@ -115,7 +116,13 @@ export async function inviteUser(
             .select()
             .from(users)
             .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-            .where(and(eq(users.email, email), eq(userOrgs.orgId, orgId)))
+            .where(
+                and(
+                    eq(users.email, email),
+                    eq(userOrgs.orgId, orgId),
+                    eq(users.type, UserType.Internal)
+                )
+            )
             .limit(1);
 
         if (existingUser.length) {
@@ -190,7 +197,7 @@ export async function inviteUser(
                         inviteLink,
                         expiresInDays: (validHours / 24).toString(),
                         orgName: org[0].name || orgId,
-                        inviterName: req.user?.email
+                        inviterName: req.user?.email || req.user?.username
                     }),
                     {
                         to: email,
@@ -242,7 +249,7 @@ export async function inviteUser(
                     inviteLink,
                     expiresInDays: (validHours / 24).toString(),
                     orgName: org[0].name || orgId,
-                    inviterName: req.user?.email
+                    inviterName: req.user?.email || req.user?.username
                 }),
                 {
                     to: email,

server/routers/user/listUsers.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { roles, userOrgs, users } from "@server/db/schemas";
+import { idp, roles, userOrgs, users } from "@server/db/schemas";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -9,6 +9,7 @@ import { sql } from "drizzle-orm";
 import logger from "@server/logger";
 import { fromZodError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
+import { eq } from "drizzle-orm";
 
 const listUsersParamsSchema = z
     .object({
@@ -41,14 +42,20 @@ async function queryUsers(orgId: string, limit: number, offset: number) {
             emailVerified: users.emailVerified,
             dateCreated: users.dateCreated,
             orgId: userOrgs.orgId,
+            username: users.username,
+            name: users.name,
+            type: users.type,
             roleId: userOrgs.roleId,
             roleName: roles.name,
-            isOwner: userOrgs.isOwner
+            isOwner: userOrgs.isOwner,
+            idpName: idp.name,
+            idpId: users.idpId
         })
         .from(users)
-        .leftJoin(userOrgs, sql`${users.userId} = ${userOrgs.userId}`)
-        .leftJoin(roles, sql`${userOrgs.roleId} = ${roles.roleId}`)
-        .where(sql`${userOrgs.orgId} = ${orgId}`)
+        .leftJoin(userOrgs, eq(users.userId, userOrgs.userId))
+        .leftJoin(roles, eq(userOrgs.roleId, roles.roleId))
+        .leftJoin(idp, eq(users.idpId, idp.idpId))
+        .where(eq(userOrgs.orgId, orgId))
         .limit(limit)
         .offset(offset);
 }