misc updates

Author: cdleveille

Dockerfile

@@ -16,7 +16,6 @@ COPY --link . .
 # install dependencies, lint project, build frontend, and compile backend
 RUN bun install --ignore-scripts --frozen-lockfile
 RUN bun run biome ci .
-RUN bun run build:prod
 RUN bun run compile
 
 # minimalist final stage for app image

src/helpers/auth.ts

@@ -1,6 +1,6 @@
 import { Config, CustomError } from "@helpers";
 
-export const assertRequestIsAuthorized = (authorization: string | undefined) => {
+export const assertIsRequestAuthorized = (authorization: string | undefined) => {
 	const token = authorization?.split("Bearer ")?.[1];
 	if (!token)
 		throw new CustomError(
@@ -9,4 +9,5 @@ export const assertRequestIsAuthorized = (authorization: string | undefined) =>
 		);
 	if (token !== Config.API_KEY)
 		throw new CustomError("Unauthorized - Bearer token does not match API_KEY value", 401);
+	return true;
 };

src/helpers/error.ts

@@ -1,7 +1,7 @@
-import type { StatusCode } from "hono/utils/http-status";
-
 import type { OpenAPIHono } from "@hono/zod-openapi";
 
+import type { TErrorStatusCode } from "@types";
+
 export class CustomError extends Error {
 	status: number;
 
@@ -17,7 +17,7 @@ export const initErrorHandling = (app: OpenAPIHono) => {
 	app.onError((e, c) => {
 		const errorStatus = (
 			"status" in e && typeof e.status === "number" ? e.status : 500
-		) as StatusCode;
+		) as TErrorStatusCode;
 		return c.json({ message: e.message || "Internal Server Error" }, errorStatus);
 	});
 };

src/routes/bag.ts

@@ -1,6 +1,6 @@
 import { bagSchema } from "discit-types";
 
-import { assertRequestIsAuthorized, authHeaderSchema, resMessageSchema } from "@helpers";
+import { assertIsRequestAuthorized, authHeaderSchema, resMessageSchema } from "@helpers";
 import { type OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
 import { Bag } from "@models";
 
@@ -31,7 +31,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { user_id } = c.req.valid("query");
 			const bags = await Bag.getBags(user_id);
 			return c.json(bags, 200);
@@ -68,7 +68,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { id } = c.req.valid("param");
 			const bag = await Bag.assertBagExists(id);
 			return c.json(bag, 200);
@@ -112,7 +112,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { user_id, name } = c.req.valid("json");
 			const bag = await Bag.createBag(user_id, name);
 			return c.json(bag, 201);
@@ -160,7 +160,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { id, disc_id } = c.req.valid("json");
 			const bag = await Bag.addDiscToBag(id, disc_id);
 			return c.json(bag, 200);
@@ -208,7 +208,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { id, disc_id } = c.req.valid("json");
 			const bag = await Bag.removeDiscFromBag(id, disc_id);
 			return c.json(bag, 200);
@@ -256,7 +256,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { id, name } = c.req.valid("json");
 			const bag = await Bag.updateBagName(id, name);
 			return c.json(bag, 200);
@@ -293,7 +293,7 @@ export const initBagRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const { id } = c.req.valid("param");
 			const bag = await Bag.deleteBag(id);
 			return c.json(bag, 200);

src/routes/disc.ts

@@ -1,7 +1,7 @@
 import { discSchema } from "discit-types";
 
 import {
-	assertRequestIsAuthorized,
+	assertIsRequestAuthorized,
 	authHeaderSchema,
 	discQuerySchema,
 	resMessageSchema
@@ -99,7 +99,7 @@ export const initDiscRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			const body = c.req.valid("json");
 			const discs = await Disc.insertDiscs(body);
 			return c.json(discs, 201);
@@ -131,7 +131,7 @@ export const initDiscRoutes = (app: OpenAPIHono) => {
 		}),
 		async c => {
 			const { authorization } = c.req.valid("header");
-			assertRequestIsAuthorized(authorization);
+			assertIsRequestAuthorized(authorization);
 			await Disc.deleteAllDiscs();
 			return c.json({ message: "All discs deleted successfully" }, 200);
 		}

src/types/abstract/index.ts

@@ -13,3 +13,5 @@ export type TDisc = types.TDisc;
 export type TDiscQuery = z.infer<typeof discQuerySchema>;
 
 export type TBag = types.TBag;
+
+export type TErrorStatusCode = 400 | 401 | 404 | 500;