feat(user stuff): added in all the user stuff

app/src/internal/admin/controller/users/newUser.ts

@@ -0,0 +1,42 @@
+import type { User } from "better-auth";
+import { DrizzleQueryError } from "drizzle-orm";
+import { auth } from "../../../../pkg/auth/auth.js";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
+
+export type NewUser = {
+	email: string;
+	password: string;
+	username: string;
+	statusCode: number;
+	message: string;
+};
+
+export const createNewUser = async (userData: NewUser) => {
+	const { data, error } = await tryCatch(
+		auth.api.createUser({
+			body: {
+				email: userData.email, // required
+				password: userData.password, // required
+				name: userData.username, // required
+				role: "user",
+				data: { username: userData.username },
+			},
+		}),
+	);
+
+	if (error) {
+		if (error instanceof DrizzleQueryError) {
+			// @ts-ignore
+			if (error?.cause.message.includes("unique constraint")) {
+				return {
+					statusCode: 400,
+					message: `${userData.username} already exists`,
+				};
+			}
+		}
+
+		return error;
+	}
+
+	return data;
+};

app/src/internal/admin/routes.ts

@@ -1,11 +1,9 @@
 import type { Express, Request, Response } from "express";
 import { requireAuth } from "../../pkg/middleware/authMiddleware.js";
 import { mainServerSync } from "./controller/servers/matchServers.js";
-//admin routes
-import users from "./routes/getUserRoles.js";
-import grantRoles from "./routes/grantRole.js";
-import revokeRoles from "./routes/revokeRole.js";
 import servers from "./routes/servers/serverRoutes.js";
+//admin routes
+import users from "./routes/users/userRoutes.js";
 
 export const setupAdminRoutes = (app: Express, basePath: string) => {
 	app.use(
@@ -15,22 +13,10 @@ export const setupAdminRoutes = (app: Express, basePath: string) => {
 
 	app.use(
 		basePath + "/api/admin/users",
-		requireAuth("user", ["systemAdmin"]), // will pass bc system admin but this is just telling us we need this
+		requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
 		users,
 	);
 
-	app.use(
-		basePath + "/api/admin",
-		requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
-		grantRoles,
-	);
-
-	app.use(
-		basePath + "/api/admin",
-		requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
-		revokeRoles,
-	);
-
 	// run the sync only on startup
 	setTimeout(() => {
 		mainServerSync();

app/src/internal/admin/routes/getUserRoles.ts

@@ -1,52 +0,0 @@
-import { Router } from "express";
-import type { Request, Response } from "express";
-import { tryCatch } from "../../../pkg/utils/tryCatch.js";
-import { db } from "../../../pkg/db/db.js";
-import { user } from "../../../pkg/db/schema/auth-schema.js";
-import { userRoles } from "../../../pkg/db/schema/user_roles.js";
-
-const router = Router();
-
-router.post("/", async (req: Request, res: Response) => {
-    // should get all users
-    const { data: users, error: userError } = await tryCatch(
-        db.select().from(user)
-    );
-
-    if (userError) {
-        return res.status(500).json({
-            success: false,
-            message: "Failed to get users",
-            error: userError,
-        });
-    }
-    // should get all roles
-
-    const { data: userRole, error: userRoleError } = await tryCatch(
-        db.select().from(userRoles)
-    );
-
-    if (userRoleError) {
-        return res.status(500).json({
-            success: false,
-            message: "Failed to get userRoless",
-            error: userRoleError,
-        });
-    }
-
-    // add the roles and return
-
-    const usersWithRoles = users.map((user) => {
-        const roles = userRole
-            .filter((ur) => ur.userId === user.id)
-            .map((ur) => ({ module: ur.module, role: ur.role }));
-
-        return { ...user, roles };
-    });
-
-    return res
-        .status(200)
-        .json({ success: true, message: "User data", data: usersWithRoles });
-});
-
-export default router;

app/src/internal/admin/routes/users/changeUserPassword.ts

@@ -0,0 +1,25 @@
+import { type Request, type Response, Router } from "express";
+import { auth } from "../../../../pkg/auth/auth.js";
+
+const router = Router();
+
+router.patch("/:userId", async (req: Request, res: Response) => {
+	const userId = req.params.userId;
+	const cookieHeader = req.headers.cookie ?? "";
+	const authorization = req.headers.authorization ?? "";
+
+	const data = await auth.api.setUserPassword({
+		body: {
+			newPassword: req.body.password, // required
+			userId: userId, // required
+		},
+		// This endpoint requires session cookies.
+		headers: {
+			cookie: cookieHeader,
+			authorization,
+		},
+	});
+
+	return res.status(200).json({ message: "Password was just changed." });
+});
+export default router;

app/src/internal/admin/routes/users/createUser.ts

@@ -0,0 +1,20 @@
+import { type Request, type Response, Router } from "express";
+import { createNewUser, type NewUser } from "../../controller/users/newUser.js";
+
+const router = Router();
+
+router.post("/", async (req: Request, res: Response) => {
+	const body = req.body;
+	const user = (await createNewUser(body)) as NewUser;
+
+	if (user?.statusCode === 400) {
+		return res.status(user?.statusCode).json({
+			message: user?.message,
+		});
+	}
+
+	return res
+		.status(200)
+		.json({ message: `${body.username}, was just created` });
+});
+export default router;

app/src/internal/admin/routes/users/deleteUser.ts

@@ -0,0 +1,24 @@
+import { type Request, type Response, Router } from "express";
+import { auth } from "../../../../pkg/auth/auth.js";
+
+const router = Router();
+
+router.delete("/:userId", async (req: Request, res: Response) => {
+	const userId = req.params.userId;
+	const cookieHeader = req.headers.cookie ?? "";
+	const authorization = req.headers.authorization ?? "";
+
+	const data = await auth.api.removeUser({
+		body: {
+			userId: userId, // required
+		},
+		// This endpoint requires session cookies.
+		headers: {
+			cookie: cookieHeader,
+			authorization,
+		},
+	});
+
+	return res.status(200).json({ message: "User was just deleted." });
+});
+export default router;

app/src/internal/admin/routes/users/getActiveSessions.ts

@@ -0,0 +1,25 @@
+import { type Request, type Response, Router } from "express";
+import { auth } from "../../../../pkg/auth/auth.js";
+
+const router = Router();
+
+router.patch("/:userId", async (req: Request, res: Response) => {
+	const userId = req.params.userId;
+	const cookieHeader = req.headers.cookie ?? "";
+	const authorization = req.headers.authorization ?? "";
+
+	const data = await auth.api.setUserPassword({
+		body: {
+			newPassword: req.body.password, // required
+			userId: userId, // required
+		},
+		// This endpoint requires session cookies.
+		headers: {
+			cookie: cookieHeader,
+			authorization,
+		},
+	});
+
+	return res.status(200).json({ message: "Password was just changed." });
+});
+export default router;

app/src/internal/admin/routes/users/getUserRoles.ts

@@ -0,0 +1,52 @@
+import type { Request, Response } from "express";
+import { Router } from "express";
+import { db } from "../../../../pkg/db/db.js";
+import { user } from "../../../../pkg/db/schema/auth-schema.js";
+import { userRoles } from "../../../../pkg/db/schema/user_roles.js";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
+
+const router = Router();
+
+router.post("/", async (req: Request, res: Response) => {
+	// should get all users
+	const { data: users, error: userError } = await tryCatch(
+		db.select().from(user),
+	);
+
+	if (userError) {
+		return res.status(500).json({
+			success: false,
+			message: "Failed to get users",
+			error: userError,
+		});
+	}
+	// should get all roles
+
+	const { data: userRole, error: userRoleError } = await tryCatch(
+		db.select().from(userRoles),
+	);
+
+	if (userRoleError) {
+		return res.status(500).json({
+			success: false,
+			message: "Failed to get userRoless",
+			error: userRoleError,
+		});
+	}
+
+	// add the roles and return
+
+	const usersWithRoles = users.map((user) => {
+		const roles = userRole
+			.filter((ur) => ur.userId === user.id)
+			.map((ur) => ({ module: ur.module, role: ur.role }));
+
+		return { ...user, roles };
+	});
+
+	return res
+		.status(200)
+		.json({ success: true, message: "User data", data: usersWithRoles });
+});
+
+export default router;

app/src/internal/admin/routes/users/grantRole.ts

@@ -1,10 +1,9 @@
 import type { Request, Response } from "express";
 import { Router } from "express";
 import z from "zod";
-import { db } from "../../../pkg/db/db.js";
-import { userRoles } from "../../../pkg/db/schema/user_roles.js";
-import { createLogger } from "../../../pkg/logger/logger.js";
-import { tryCatch } from "../../../pkg/utils/tryCatch.js";
+import { db } from "../../../../pkg/db/db.js";
+import { userRoles } from "../../../../pkg/db/schema/user_roles.js";
+import { createLogger } from "../../../../pkg/logger/logger.js";
 
 const roleSchema = z.object({
 	module: z.enum([

app/src/internal/admin/routes/users/revokeRole.ts

@@ -2,10 +2,9 @@ import { and, eq } from "drizzle-orm";
 import type { Request, Response } from "express";
 import { Router } from "express";
 import z from "zod";
-import { db } from "../../../pkg/db/db.js";
-import { userRoles } from "../../../pkg/db/schema/user_roles.js";
-import { createLogger } from "../../../pkg/logger/logger.js";
-import { tryCatch } from "../../../pkg/utils/tryCatch.js";
+import { db } from "../../../../pkg/db/db.js";
+import { userRoles } from "../../../../pkg/db/schema/user_roles.js";
+import { createLogger } from "../../../../pkg/logger/logger.js";
 
 const roleSchema = z.object({
 	module: z.enum([

app/src/internal/admin/routes/users/userRoutes.ts

@@ -0,0 +1,51 @@
+import { fromNodeHeaders } from "better-auth/node";
+import type { Request, Response } from "express";
+import { Router } from "express";
+import { auth } from "../../../../pkg/auth/auth.js";
+import { requireAuth } from "../../../../pkg/middleware/authMiddleware.js";
+import changePassword from "./changeUserPassword.js";
+import createUser from "./createUser.js";
+import deleteUser from "./deleteUser.js";
+import users from "./getUserRoles.js";
+import grantRoles from "./grantRole.js";
+import revokeRoles from "./revokeRole.js";
+
+const router = Router();
+
+router.use(
+	"/",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	grantRoles,
+);
+
+router.use(
+	"/new",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	createUser,
+);
+
+router.use(
+	"/",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	revokeRoles,
+);
+
+router.use(
+	"/",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	users,
+);
+
+router.use(
+	"/changePassword",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	changePassword,
+);
+
+router.use(
+	"/delete",
+	requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
+	deleteUser,
+);
+
+export default router;