feat(intial auth): intial auth setup for the scanner

backend/db/db.controller.ts

@@ -1,6 +1,8 @@
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 
+import * as scanUserSchema from "./schema/scanUsers.js";
+
 const dbURL = `postgres://${process.env.DATABASE_USER}:${process.env.DATABASE_PASSWORD}@${process.env.DATABASE_HOST}:${process.env.DATABASE_PORT}/${process.env.DATABASE_DB}`;
 
 const queryClient = postgres(dbURL, {
@@ -13,4 +15,10 @@ const queryClient = postgres(dbURL, {
 	},
 });
 
-export const db = drizzle({ client: queryClient });
+//export const db = drizzle({ client: queryClient });
+
+export const db = drizzle(queryClient, {
+	schema: {
+		...scanUserSchema,
+	},
+});

backend/db/schema/scanUsers.ts

@@ -0,0 +1,47 @@
+import {
+	boolean,
+	pgEnum,
+	pgTable,
+	text,
+	timestamp,
+	unique,
+	uuid,
+} from "drizzle-orm/pg-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import type z from "zod";
+
+export const mobileRoleEnum = pgEnum("mobile_role", [
+	"user",
+	"lead",
+	"manager",
+	"admin",
+]);
+
+export const scanUser = pgTable(
+	"scan_users",
+	{
+		id: uuid("id").defaultRandom().primaryKey(),
+		name: text("name").notNull(), // the user that will be using the scanner
+		scannerId: text("scanner_id").unique().notNull(),
+		pinNumber: text("pin_number").unique().notNull(),
+		pinHash: text("pin_hash").notNull(),
+		excludedCommand: text("excluded_commands").default(""),
+		role: mobileRoleEnum("role").notNull().default("user"),
+		active: boolean("active").default(true),
+		lastScan: timestamp("last_scan").defaultNow(),
+		add_Date: timestamp("add_Date").defaultNow(),
+		upd_date: timestamp("upd_date").defaultNow(),
+	},
+	(table) => ({
+		userNotificationUnique: unique("scan_user_unique").on(
+			table.scannerId,
+			table.pinNumber,
+		),
+	}),
+);
+
+export const scanUserSchema = createSelectSchema(scanUser);
+export const newsSanUserSchema = createInsertSchema(scanUser);
+
+export type ScanUser = z.infer<typeof scanUserSchema>;
+export type NewScanUser = z.infer<typeof newsSanUserSchema>;

backend/mobile/donwloadApps.route.ts

@@ -0,0 +1,46 @@
+import fs from "node:fs";
+import { Router } from "express";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const router = Router();
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const downloadDir = path.resolve(__dirname, "../../downloads/mobile");
+
+const currentApk = {
+	fileName: "lst-mobile.apk",
+};
+
+router.get("/latest", (_, res) => {
+	const apkPath = path.join(downloadDir, currentApk.fileName);
+
+	if (!fs.existsSync(apkPath)) {
+		return res.status(404).json({ success: false, message: "APK not found" });
+	}
+
+	res.setHeader("Content-Type", "application/vnd.android.package-archive");
+	res.setHeader(
+		"Content-Disposition",
+		`attachment; filename="${currentApk.fileName}"`,
+	);
+
+	return res.sendFile(apkPath);
+});
+
+router.get("/ehs", (_, res) => {
+	const apkPath = path.join(downloadDir, "EHS.apk");
+
+	if (!fs.existsSync(apkPath)) {
+		return res.status(404).json({ success: false, message: "APK not found" });
+	}
+
+	res.setHeader("Content-Type", "application/vnd.android.package-archive");
+	res.setHeader("Content-Disposition", `attachment; filename="EHS.apk}"`);
+
+	return res.sendFile(apkPath);
+});
+
+export default router;

backend/mobile/mobile.routes.ts

@@ -0,0 +1,17 @@
+import type { Express } from "express";
+import downloads from "./donwloadApps.route.js";
+import authPin from "./mobileAuth.route.js";
+import newPin from "./mobilePin.route.js";
+import logs from "./scanLogs.route.js";
+import version from "./version.route.js";
+
+export const setupMobileRoutes = (baseUrl: string, app: Express) => {
+	//stats will be like this as we dont need to change this
+	app.use(`${baseUrl}/api/mobile/version`, version);
+	app.use(`${baseUrl}/api/mobile/apk`, downloads);
+	app.use(`${baseUrl}/api/mobile/logs`, logs);
+	app.use(`${baseUrl}/api/mobile/auth`, authPin);
+	app.use(`${baseUrl}/api/mobile/pin`, newPin);
+
+	// all other system should be under /api/system/*
+};

backend/mobile/mobileAuth.route.ts

@@ -0,0 +1,331 @@
+import bcrypt from "bcryptjs";
+import { eq, sql } from "drizzle-orm";
+import { Router } from "express";
+import z from "zod";
+import { db } from "../db/db.controller.js";
+import {
+	type NewScanUser,
+	type ScanUser,
+	scanUser,
+} from "../db/schema/scanUsers.js";
+import { requireAuth } from "../middleware/auth.middleware.js";
+import { apiReturn, returnFunc } from "../utils/returnHelper.utils.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
+
+const r = Router();
+
+export async function hashPin(pin: string) {
+	//   if (!/^\d{6}$/.test(pin)) {
+	//     throw new Error("PIN must be exactly 6 digits");
+	//   }
+
+	return bcrypt.hashSync(pin, 12);
+}
+
+const registerSchema = z.object({
+	name: z.string().min(2).max(100),
+	pinNumber: z.string(),
+	scannerId: z
+		.string()
+		.min(1)
+		.max(500)
+		.optional()
+		.describe("if you leave blank it will be the same as your username"),
+	role: z
+		.enum(["user", "lead", "manager", "admin"])
+		.optional()
+		.describe("What roles are available to use."),
+	pinHash: z.string().optional(),
+});
+
+r.post("/pin", async (req, res) => {
+	const { pin } = req.body;
+
+	if (!pin || pin.length !== 6) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Pin number must be a min of 6 digits`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	// const user = await db
+	// 	.select()
+	// 	.from(scanUser)
+	// 	.where(eq(scanUser.pinNumber, parseInt(pin, 10)));
+
+	const user = await db.query.scanUser.findFirst({
+		where: (u, { eq }) => eq(u.pinNumber, pin),
+	});
+
+	if (!user) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid login please try again.`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	const validPin = bcrypt.compareSync(pin, user.pinHash);
+
+	if (!validPin) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid pin please try again.`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "auth",
+		message: `Welcome back ${user.name}`,
+		data: user as ScanUser | any,
+		status: 200,
+	});
+});
+
+r.post("/user", async (req, res) => {
+	try {
+		// validate the body is correct before accepting it
+		let validated = registerSchema.parse(req.body);
+
+		validated = {
+			...validated,
+			pinHash: await hashPin(validated.pinNumber.toString()),
+		};
+
+		const values: NewScanUser = {
+			name: validated.name,
+			pinNumber: validated.pinNumber,
+			pinHash: validated.pinHash ?? "",
+			scannerId: validated.scannerId ?? "",
+		};
+
+		const newUser = await db.insert(scanUser).values(values).returning();
+
+		apiReturn(res, {
+			success: true,
+			level: "info", //connect.success ? "info" : "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `${validated.name} was just created`,
+			data: newUser as any,
+			status: 200, //connect.success ? 200 : 400,
+		});
+	} catch (err) {
+		if (err instanceof z.ZodError) {
+			const flattened = z.flattenError(err);
+			// return res.status(400).json({
+			// 	error: "Validation failed",
+			// 	details: flattened,
+			// });
+
+			return apiReturn(res, {
+				success: false,
+				level: "error", //connect.success ? "info" : "error",
+				module: "mobile",
+				subModule: "auth",
+				message: "Validation failed",
+				data: [flattened.fieldErrors],
+				status: 400, //connect.success ? 200 : 400,
+			});
+		}
+
+		return apiReturn(res, {
+			success: false,
+			level: "error", //connect.success ? "info" : "error",
+			module: "mobile",
+			subModule: "auth",
+			message:
+				"This User already exist with this pin or scanner id please try again",
+			data: [err],
+			status: 400, //connect.success ? 200 : 400,
+		});
+	}
+});
+
+r.get("/user", requireAuth, async (_, res) => {
+	const { data, error } = await tryCatch(db.select().from(scanUser));
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error getting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: true,
+			level: "info",
+			module: "mobile",
+			subModule: "auth",
+			message: `There are no users you should add one . `,
+			data: [],
+			status: 200,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "auth",
+		message: `All users. `,
+		data,
+		status: 200,
+	});
+});
+
+r.patch("/user/:id", requireAuth, async (req, res) => {
+	const updates: Record<string, unknown | null> = {};
+	const { id } = req.params;
+
+	const { data, error } = await tryCatch(
+		db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.id, `${id}`),
+		}),
+	);
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error getting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid user id was passed over. `,
+			data: [],
+			status: 400,
+		});
+	}
+
+	if (req.body?.name !== undefined) {
+		updates.name = req.body.name;
+	}
+
+	if (req.body?.pinNumber !== undefined) {
+		const existing = await db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.pinHash, req.body.pinNumber),
+		});
+
+		if (existing)
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "mobile",
+				subModule: "auth",
+				message: `${req.body.pinNumber} already exists please try again`,
+				data: [],
+				notify: false,
+				room: "",
+			});
+		updates.pinNumber = req.body.pinNumber;
+		updates.pinHash = await hashPin(req.body.pinNumber);
+	}
+
+	if (req.body?.scannerId !== undefined) {
+		updates.scannerId = req.body.scannerId;
+	}
+
+	if (req.body?.active !== undefined) {
+		updates.active = req.body.active;
+	}
+
+	if (req.body?.role !== undefined) {
+		updates.role = req.body.role;
+	}
+
+	updates.upd_date = sql`NOW()`;
+
+	const updatedSetting = await db
+		.update(scanUser)
+		.set(updates)
+		.where(eq(scanUser.id, `${id}`))
+		.returning();
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "user",
+		message: `User ${data.name} was updated. `,
+		data: updatedSetting,
+		status: 200,
+	});
+});
+
+r.delete("/user/:id", requireAuth, async (req, res) => {
+	const { id } = req.params;
+
+	const { data, error } = await tryCatch(
+		db.delete(scanUser).where(eq(scanUser.id, `${id}`)),
+	);
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error deleting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was no user to delete. `,
+			data: [],
+			status: 400,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "user",
+		message: `User was deleted. `,
+		data: data ?? [],
+		status: 200,
+	});
+});
+
+export default r;

backend/mobile/mobilePin.route.ts

@@ -0,0 +1,21 @@
+import { Router } from "express";
+import { generateUniquePin } from "../utils/generateScannerPin.utils.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+
+const r = Router();
+
+r.get("/new", async (_, res) => {
+	const getPin = await generateUniquePin();
+
+	return apiReturn(res, {
+		success: getPin.success,
+		level: getPin.level,
+		module: "mobile",
+		subModule: "auth",
+		message: getPin.message,
+		data: getPin.data,
+		status: getPin.success ? 200 : 400,
+	});
+});
+
+export default r;

backend/mobile/scanLogs.route.ts

@@ -0,0 +1,35 @@
+import { Router } from "express";
+
+import { db } from "../db/db.controller.js";
+import { scanLog } from "../db/schema/scanlog.schema.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+
+const router = Router();
+
+router.post("/", async (req, res) => {
+	const body = req.body;
+
+	const newLog = await db
+		.insert(scanLog)
+		.values({
+			scannerId: body.scannerId,
+			message: body.message,
+			prompt: body.prompt,
+			commandDescription: body.commandDescription,
+			status: body.status,
+			lines: body.lines,
+		})
+		.returning();
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "scan logs",
+		message: `New log from ${body.scannerId}`,
+		data: newLog,
+		status: 200,
+	});
+});
+
+export default router;

backend/mobile/version.route.ts

@@ -0,0 +1,28 @@
+import fs from "node:fs";
+import { Router } from "express";
+
+import path from "path";
+
+const router = Router();
+
+const projectRoot = path.resolve("./lstMobile"); // adjust as needed
+const appJsonPath = path.join(projectRoot, "app.json");
+
+router.get("/", async (req, res) => {
+	const baseUrl = `${req.protocol}://${req.get("host")}`;
+
+	const raw = fs.readFileSync(appJsonPath, "utf-8");
+	const config = JSON.parse(raw);
+
+	const exp = config.expo;
+
+	res.json({
+		packageName: exp.android?.package,
+		versionName: exp.version,
+		versionCode: exp.android?.versionCode,
+		minSupportedVersionCode: exp?.android?.minSupportedVersionCode ?? 0,
+		downloadUrl: `${baseUrl}/lst/api/mobile/apk/latest`,
+	});
+});
+
+export default router;

backend/routeHandler.routes.ts

@@ -5,6 +5,7 @@ import { setupAuthRoutes } from "./auth/auth.routes.js";
 import { setupApiDocsRoutes } from "./configs/scaler.config.js";
 import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
 import { setupGPSqlRoutes } from "./gpSql/gpSql.routes.js";
+import { setupMobileRoutes } from "./mobile/mobile.routes.js";
 import { setupNotificationRoutes } from "./notification/notification.routes.js";
 import { setupOCPRoutes } from "./ocp/ocp.routes.js";
 import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
@@ -27,4 +28,5 @@ export const setupRoutes = (baseUrl: string, app: Express) => {
 	setupNotificationRoutes(baseUrl, app);
 	setupOCPRoutes(baseUrl, app);
 	setupTCPRoutes(baseUrl, app);
+	setupMobileRoutes(baseUrl, app);
 };

backend/system/serverData.controller.ts

@@ -34,7 +34,7 @@ const servers: NewServerData[] = [
 		name: "Lima",
 		server: "USLIM1VMS006",
 		plantToken: "uslim1",
-		idAddress: "10.53.0.26",
+		idAddress: "10.53.0.26", // port opened 3000 2222
 		greatPlainsPlantCode: "50",
 		contactEmail: "",
 		contactPhone: "",
@@ -56,7 +56,7 @@ const servers: NewServerData[] = [
 		name: "Dayton",
 		server: "usday1VMS006",
 		plantToken: "usday1",
-		idAddress: "10.44.0.56", // 3000 opened and working
+		idAddress: "10.44.0.56", // ports opened 3000 and 2222
 		greatPlainsPlantCode: "80",
 		contactEmail: "",
 		contactPhone: "",
@@ -122,7 +122,7 @@ const servers: NewServerData[] = [
 		name: "Marked Tree",
 		server: "USMAR1VMS006",
 		plantToken: "usmar1",
-		idAddress: "10.206.9.26",
+		idAddress: "10.206.9.26", // 3000,2222 requested REQ0236838
 		greatPlainsPlantCode: "90",
 		contactEmail: "",
 		contactPhone: "",
@@ -144,7 +144,7 @@ const servers: NewServerData[] = [
 		name: "Bowling Green 1",
 		server: "USBOW1VMS006",
 		plantToken: "usbow1",
-		idAddress: "10.25.0.26", //  3000 is open REQ0236527
+		idAddress: "10.25.0.26", //  3000 is open REQ0236527 2222 already open
 		greatPlainsPlantCode: "55",
 		contactEmail: "",
 		contactPhone: "",

backend/system/system.mobileApp.ts

@@ -1,93 +0,0 @@
-import fs from "node:fs";
-import { Router } from "express";
-import path from "path";
-import { fileURLToPath } from "url";
-import { db } from "../db/db.controller.js";
-import { scanLog } from "../db/schema/scanlog.schema.js";
-import { apiReturn } from "../utils/returnHelper.utils.js";
-
-const router = Router();
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const downloadDir = path.resolve(__dirname, "../../downloads/mobile");
-const projectRoot = path.resolve("./lstMobile"); // adjust as needed
-const appJsonPath = path.join(projectRoot, "app.json");
-
-const currentApk = {
-	fileName: "lst-mobile.apk",
-};
-
-router.get("/version", async (req, res) => {
-	const baseUrl = `${req.protocol}://${req.get("host")}`;
-
-	const raw = fs.readFileSync(appJsonPath, "utf-8");
-	const config = JSON.parse(raw);
-
-	const exp = config.expo;
-
-	res.json({
-		packageName: exp.android?.package,
-		versionName: exp.version,
-		versionCode: exp.android?.versionCode,
-		minSupportedVersionCode: exp?.android?.minSupportedVersionCode ?? 0,
-		downloadUrl: `${baseUrl}/lst/api/mobile/apk/latest`,
-	});
-});
-
-router.get("/apk/latest", (_, res) => {
-	const apkPath = path.join(downloadDir, currentApk.fileName);
-
-	if (!fs.existsSync(apkPath)) {
-		return res.status(404).json({ success: false, message: "APK not found" });
-	}
-
-	res.setHeader("Content-Type", "application/vnd.android.package-archive");
-	res.setHeader(
-		"Content-Disposition",
-		`attachment; filename="${currentApk.fileName}"`,
-	);
-
-	return res.sendFile(apkPath);
-});
-
-router.get("/apk/ehs", (_, res) => {
-	const apkPath = path.join(downloadDir, "EHS.apk");
-
-	if (!fs.existsSync(apkPath)) {
-		return res.status(404).json({ success: false, message: "APK not found" });
-	}
-
-	res.setHeader("Content-Type", "application/vnd.android.package-archive");
-	res.setHeader("Content-Disposition", `attachment; filename="EHS.apk}"`);
-
-	return res.sendFile(apkPath);
-});
-
-router.post("/logs", async (req, res) => {
-	const body = req.body;
-	const newLog = await db
-		.insert(scanLog)
-		.values({
-			scannerId: body.data.scannerId,
-			message: body.data.message,
-			prompt: body.data.prompt,
-			commandDescription: body.data.commandDescription,
-			status: body.data.status,
-			lines: body.data.lines,
-		})
-		.returning();
-
-	return apiReturn(res, {
-		success: true,
-		level: "info",
-		module: "mobile",
-		subModule: "scan logs",
-		message: `New log from ${body.data.scannerId}`,
-		data: newLog,
-		status: 200,
-	});
-});
-
-export default router;

backend/system/system.routes.ts

@@ -4,12 +4,10 @@ import getServers from "./serverData.route.js";
 import getSettings from "./settings.route.js";
 import updSetting from "./settingsUpdate.route.js";
 import stats from "./stats.route.js";
-import mobile from "./system.mobileApp.js";
 
 export const setupSystemRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
 	app.use(`${baseUrl}/api/stats`, stats);
-	app.use(`${baseUrl}/api/mobile`, mobile);
 	app.use(`${baseUrl}/api/settings`, getSettings);
 	app.use(`${baseUrl}/api/servers`, getServers);
 	app.use(`${baseUrl}/api/settings`, requireAuth, updSetting);

backend/utils/generateScannerPin.utils.ts

@@ -0,0 +1,39 @@
+import { db } from "../db/db.controller.js";
+import { returnFunc } from "./returnHelper.utils.js";
+
+export function generateSixDigitPin() {
+	return Math.floor(100000 + Math.random() * 900000).toString();
+}
+
+export async function generateUniquePin() {
+	for (let i = 0; i < 10; i++) {
+		const pin = generateSixDigitPin();
+
+		const existing = await db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.pinHash, pin), // ⚠️ we'll fix this below
+		});
+
+		if (!existing)
+			return returnFunc({
+				success: true,
+				level: "info",
+				module: "utils",
+				subModule: "genPin",
+				message: "New pin generated",
+				data: [{ pin: pin }],
+				notify: false,
+				room: "",
+			});
+	}
+
+	return returnFunc({
+		success: false,
+		level: "error",
+		module: "utils",
+		subModule: "genPin",
+		message: "Failed to generate unique PIN after 10 attempts",
+		data: [],
+		notify: true,
+		room: "",
+	});
+}