fix(app): required auth was in wrong spot caused entire app to want you logged in

backend/admin/admin.routes.ts

@@ -3,16 +3,14 @@ import { requireAuth } from "../middleware/auth.middleware.js";
 
 import build from "./admin.build.js";
 import update from "./admin.updateServer.js";
+import users from "./admin.users.js";
 
 export const setupAdminRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
-	app.use(`${baseUrl}/api/admin/build`, requireAuth, build);
-	app.use(
-		`${baseUrl}/api/admin/build`,
-		requireAuth,
 
-		update,
-	);
+	app.use(`${baseUrl}/api/admin/build`, requireAuth, build);
+	app.use(`${baseUrl}/api/admin/build`, requireAuth, update);
+	app.use(`${baseUrl}/api/admin/user`, requireAuth, users);
 
 	// all other system should be under /api/system/*
 };

backend/app.ts

@@ -34,7 +34,6 @@ const createApp = async () => {
 	app.use(routeHitMiddleware);
 	app.all(`${baseUrl}/api/auth/*splat`, toNodeHandler(auth));
 	app.use(express.json());
-	setupRoutes(baseUrl, app);
 
 	app.get(`${baseUrl}/api/lst-config.js`, (_, res) => {
 		res.type("application/javascript");
@@ -52,6 +51,8 @@ const createApp = async () => {
 	`);
 	});
 
+	setupRoutes(baseUrl, app);
+
 	app.use(
 		`${baseUrl}/app`,
 		express.static(join(__dirname, "../frontend/dist")),

backend/gpSql/gpSql.routes.ts

@@ -8,11 +8,10 @@ export const setupGPSqlRoutes = (baseUrl: string, app: Express) => {
 	//setup all the routes
 	// Apply auth to entire router
 	const router = Router();
-	router.use(requireAuth);
 
 	router.use(start);
 	router.use(stop);
 	router.use(restart);
 
-	app.use(`${baseUrl}/api/system/gpSql`, router);
+	app.use(`${baseUrl}/api/system/gpSql`, requireAuth, router);
 };

backend/ocp/ocp.printer.listener.ts

@@ -43,7 +43,7 @@ const parseZebraAlert = (body: any): PrinterEvent => {
 	};
 };
 
-r.post("/printer/listener/:printer", upload.any(), async (req, res) => {
+r.post("/:printer", upload.any(), async (req, res) => {
 	const { printer: printerName } = req.params;
 	const event: PrinterEvent = parseZebraAlert(req.body);
 

backend/ocp/ocp.printer.update.ts

@@ -21,7 +21,7 @@ import { printerSync } from "./ocp.printer.manage.js";
 
 const r = Router();
 
-r.post("/printer/update", async (_, res) => {
+r.post("/update", async (_, res) => {
 	printerSync();
 	return apiReturn(res, {
 		success: true,

backend/ocp/ocp.routes.ts

@@ -1,4 +1,4 @@
-import { type Express, Router } from "express";
+import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
 import { featureCheck } from "../middleware/featureActive.middleware.js";
 
@@ -6,20 +6,11 @@ import listener from "./ocp.printer.listener.js";
 import update from "./ocp.printer.update.js";
 
 export const setupOCPRoutes = (baseUrl: string, app: Express) => {
-	//setup all the routes
-	const router = Router();
-
-	// is the feature even on?
-	router.use(featureCheck("ocp"));
-
-	// non auth routes up here
-	router.use(listener);
-
-	// auth routes below here
-	router.use(requireAuth);
-
-	router.use(update);
-	//router.use("");
-
-	app.use(`${baseUrl}/api/ocp`, router);
+	app.use(`${baseUrl}/api/ocp/printer/listener`, featureCheck("ocp"), listener);
+	app.use(
+		`${baseUrl}/api/ocp/printer`,
+		featureCheck("ocp"),
+		requireAuth,
+		update,
+	);
 };

backend/opendock/opendock.routes.ts

@@ -1,4 +1,4 @@
-import { type Express, Router } from "express";
+import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
 import { featureCheck } from "../middleware/featureActive.middleware.js";
 
@@ -6,15 +6,11 @@ import getApt from "./opendockGetRelease.route.js";
 
 export const setupOpendockRoutes = (baseUrl: string, app: Express) => {
 	//setup all the routes
-	// Apply auth to entire router
-	const router = Router();
 
-	// is the feature even on?
-	router.use(featureCheck("opendock_sync"));
-
-	// we need to make sure we are authenticated to see the releases
-	router.use(requireAuth);
-
-	router.use(getApt);
-	app.use(`${baseUrl}/api/opendock`, router);
+	app.use(
+		`${baseUrl}/api/opendock`,
+		featureCheck("opendock_sync"),
+		requireAuth,
+		getApt,
+	);
 };

backend/prodSql/prodSql.routes.ts

@@ -10,9 +10,7 @@ export const setupProdSqlRoutes = (baseUrl: string, app: Express) => {
 	const router = Router();
 	router.use(requireAuth);
 
-	router.use(start);
-	router.use(stop);
-	router.use(restart);
-
-	app.use(`${baseUrl}/api/system/prodSql`, router);
+	app.use(`${baseUrl}/api/system/prodSql/start`, requireAuth, start);
+	app.use(`${baseUrl}/api/system/prodSql/stop`, requireAuth, stop);
+	app.use(`${baseUrl}/api/system/prodSql/restart`, requireAuth, restart);
 };

backend/prodSql/prodSqlRestart.route.ts

@@ -4,7 +4,7 @@ import { closePool, connectProdSql } from "./prodSqlConnection.controller.js";
 
 const r = Router();
 
-r.post("/restart", async (_, res) => {
+r.post("/", async (_, res) => {
 	await closePool();
 
 	await new Promise((r) => setTimeout(r, 2000));

backend/prodSql/prodSqlStart.route.ts

@@ -4,7 +4,7 @@ import { connectProdSql } from "./prodSqlConnection.controller.js";
 
 const r = Router();
 
-r.post("/start", async (_, res) => {
+r.post("/", async (_, res) => {
 	const connect = await connectProdSql();
 	apiReturn(res, {
 		success: connect.success,

backend/prodSql/prodSqlStop.route.ts

@@ -4,7 +4,7 @@ import { closePool } from "./prodSqlConnection.controller.js";
 
 const r = Router();
 
-r.post("/stop", async (_, res) => {
+r.post("/", async (_, res) => {
 	const connect = await closePool();
 	apiReturn(res, {
 		success: connect.success,

backend/routeHandler.routes.ts

@@ -16,6 +16,7 @@ import { setupUtilsRoutes } from "./utils/utils.routes.js";
 
 export const setupRoutes = (baseUrl: string, app: Express) => {
 	//routes that are on by default
+	setupMobileRoutes(baseUrl, app);
 	setupSystemRoutes(baseUrl, app);
 	setupAdminRoutes(baseUrl, app);
 	setupApiDocsRoutes(baseUrl, app);
@@ -28,5 +29,4 @@ export const setupRoutes = (baseUrl: string, app: Express) => {
 	setupNotificationRoutes(baseUrl, app);
 	setupOCPRoutes(baseUrl, app);
 	setupTCPRoutes(baseUrl, app);
-	setupMobileRoutes(baseUrl, app);
 };