Merge branch 'dev' into clients-pops-dev

server/routers/user/adminGetUser.ts

@@ -0,0 +1,94 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db } from "@server/db";
+import { idp, users } from "@server/db";
+import { eq } from "drizzle-orm";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { OpenAPITags, registry } from "@server/openApi";
+
+const adminGetUserSchema = z
+    .object({
+        userId: z.string().min(1)
+    })
+    .strict();
+
+registry.registerPath({
+    method: "get",
+    path: "/user/{userId}",
+    description: "Get a user by ID.",
+    tags: [OpenAPITags.User],
+    request: {
+        params: adminGetUserSchema
+    },
+    responses: {}
+});
+
+async function queryUser(userId: string) {
+    const [user] = await db
+        .select({
+            userId: users.userId,
+            email: users.email,
+            username: users.username,
+            name: users.name,
+            type: users.type,
+            twoFactorEnabled: users.twoFactorEnabled,
+            twoFactorSetupRequested: users.twoFactorSetupRequested,
+            emailVerified: users.emailVerified,
+            serverAdmin: users.serverAdmin,
+            idpName: idp.name,
+            idpId: users.idpId,
+            dateCreated: users.dateCreated
+        })
+        .from(users)
+        .leftJoin(idp, eq(users.idpId, idp.idpId))
+        .where(eq(users.userId, userId))
+        .limit(1);
+    return user;
+}
+
+export type AdminGetUserResponse = NonNullable<
+    Awaited<ReturnType<typeof queryUser>>
+>;
+
+export async function adminGetUser(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = adminGetUserSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(HttpCode.BAD_REQUEST, "Invalid user ID")
+            );
+        }
+        const { userId } = parsedParams.data;
+
+        const user = await queryUser(userId);
+
+        if (!user) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `User with ID ${userId} not found`
+                )
+            );
+        }
+
+        return response<AdminGetUserResponse>(res, {
+            data: user,
+            success: true,
+            error: false,
+            message: "User retrieved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}

server/routers/user/adminListUsers.ts

@@ -37,7 +37,9 @@ async function queryUsers(limit: number, offset: number) {
             serverAdmin: users.serverAdmin,
             type: users.type,
             idpName: idp.name,
-            idpId: users.idpId
+            idpId: users.idpId,
+            twoFactorEnabled: users.twoFactorEnabled,
+            twoFactorSetupRequested: users.twoFactorSetupRequested
         })
         .from(users)
         .leftJoin(idp, eq(users.idpId, idp.idpId))

server/routers/user/adminUpdateUser2FA.ts

@@ -0,0 +1,133 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db } from "@server/db";
+import { users, userOrgs } from "@server/db";
+import { eq, and } from "drizzle-orm";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+
+const updateUser2FAParamsSchema = z
+    .object({
+        userId: z.string()
+    })
+    .strict();
+
+const updateUser2FABodySchema = z
+    .object({
+        twoFactorSetupRequested: z.boolean()
+    })
+    .strict();
+
+export type UpdateUser2FAResponse = {
+    userId: string;
+    twoFactorRequested: boolean;
+};
+
+registry.registerPath({
+    method: "post",
+    path: "/user/{userId}/2fa",
+    description: "Update a user's 2FA status.",
+    tags: [OpenAPITags.User],
+    request: {
+        params: updateUser2FAParamsSchema,
+        body: {
+            content: {
+                "application/json": {
+                    schema: updateUser2FABodySchema
+                }
+            }
+        }
+    },
+    responses: {}
+});
+
+export async function updateUser2FA(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = updateUser2FAParamsSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const parsedBody = updateUser2FABodySchema.safeParse(req.body);
+        if (!parsedBody.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedBody.error).toString()
+                )
+            );
+        }
+
+        const { userId } = parsedParams.data;
+        const { twoFactorSetupRequested } = parsedBody.data;
+
+        // Verify the user exists in the organization
+        const existingUser = await db
+            .select()
+            .from(users)
+            .where(eq(users.userId, userId))
+            .limit(1);
+
+        if (existingUser.length === 0) {
+            return next(createHttpError(HttpCode.NOT_FOUND, "User not found"));
+        }
+
+        if (existingUser[0].type !== "internal") {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Two-factor authentication is not supported for external users"
+                )
+            );
+        }
+
+        logger.debug(`Updating 2FA for user ${userId} to ${twoFactorSetupRequested}`);
+
+        if (twoFactorSetupRequested) {
+            await db
+                .update(users)
+                .set({
+                    twoFactorSetupRequested: true,
+                })
+                .where(eq(users.userId, userId));
+        } else {
+            await db
+                .update(users)
+                .set({
+                    twoFactorSetupRequested: false,
+                    twoFactorEnabled: false,
+                    twoFactorSecret: null
+                })
+                .where(eq(users.userId, userId));
+        }
+
+        return response<UpdateUser2FAResponse>(res, {
+            data: {
+                userId: existingUser[0].userId,
+                twoFactorRequested: twoFactorSetupRequested
+            },
+            success: true,
+            error: false,
+            message: `2FA ${twoFactorSetupRequested ? "enabled" : "disabled"} for user successfully`,
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}

server/routers/user/getOrgUser.ts

@@ -23,7 +23,8 @@ async function queryUser(orgId: string, userId: string) {
             roleId: userOrgs.roleId,
             roleName: roles.name,
             isOwner: userOrgs.isOwner,
-            isAdmin: roles.isAdmin
+            isAdmin: roles.isAdmin,
+            twoFactorEnabled: users.twoFactorEnabled,
         })
         .from(userOrgs)
         .leftJoin(roles, eq(userOrgs.roleId, roles.roleId))

server/routers/user/index.ts

@@ -7,6 +7,9 @@ export * from "./acceptInvite";
 export * from "./getOrgUser";
 export * from "./adminListUsers";
 export * from "./adminRemoveUser";
+export * from "./adminGetUser";
 export * from "./listInvitations";
 export * from "./removeInvitation";
 export * from "./createOrgUser";
+export * from "./adminUpdateUser2FA";
+export * from "./adminGetUser";

server/routers/user/listUsers.ts

@@ -49,7 +49,8 @@ async function queryUsers(orgId: string, limit: number, offset: number) {
             roleName: roles.name,
             isOwner: userOrgs.isOwner,
             idpName: idp.name,
-            idpId: users.idpId
+            idpId: users.idpId,
+            twoFactorEnabled: users.twoFactorEnabled,
         })
         .from(users)
         .leftJoin(userOrgs, eq(users.userId, userOrgs.userId))