Refactor: move auth middleware (#116)

Author: abdulqshabbir

src/index.ts

@@ -2,7 +2,6 @@ import { OpenAPIHono } from '@hono/zod-openapi';
 import type { Context } from 'hono';
 import { cors } from 'hono/cors';
 import packageJson from '../package.json';
-import { authMiddleware } from './middleware/auth.ts';
 import { authRoutes } from './routes/auth/index.ts';
 import { protectedProfileRoutes, publicProfileRoutes } from './routes/profile/index.ts';
 import { privateRolesRoutes, publicRoleRoutes } from './routes/role/index.ts';
@@ -55,18 +54,16 @@ app.doc('/open-api.json', {
 	}
 });
 
-// Public routes
-app.route('/auth', authRoutes);
-app.route('/roles', publicRoleRoutes);
 // Handle static assets using Cloudflare Workers
 app.get('/assets/*', async (context: Context<EnvironmentBindings>) => context.env.ASSETS.fetch(context.req.raw));
 
 // Public routes
+app.route('/auth', authRoutes);
+app.route('/roles', publicRoleRoutes);
 app.route('/profiles', publicProfileRoutes);
 app.route('/teams', publicTeamRoutes);
 
-// Protected routes (after auth middleware)
-app.use('/*', authMiddleware);
+// Private routes
 app.route('/profiles', protectedProfileRoutes);
 app.route('/teams', protectedTeamRoutes);
 app.route('/roles', privateRolesRoutes);

src/routes/profile/index.ts

@@ -1,4 +1,5 @@
 import { createRoute, OpenAPIHono } from '@hono/zod-openapi';
+import { authMiddleware } from 'src/middleware/auth.ts';
 import { z } from 'zod';
 import { DBTables } from '../../constants/db.ts';
 import { canModifyProfile } from '../../middleware/canModifyProfile.ts';
@@ -128,7 +129,7 @@ protectedProfileRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeOrganizer] as const
+		middleware: [authMiddleware, authorizeOrganizer] as const
 	}),
 	async (context) => {
 		const body = context.req.valid('json');
@@ -176,7 +177,7 @@ protectedProfileRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeVolunteer, canModifyProfile] as const
+		middleware: [authMiddleware, authorizeVolunteer, canModifyProfile] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');
@@ -224,7 +225,7 @@ protectedProfileRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeAdmin] as const
+		middleware: [authMiddleware, authorizeAdmin] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');

src/routes/role/index.ts

@@ -1,4 +1,5 @@
 import { createRoute, OpenAPIHono } from '@hono/zod-openapi';
+import { authMiddleware } from 'src/middleware/auth.ts';
 import { z } from 'zod';
 import { DBTables } from '../../constants/db.ts';
 import { authorizeOrganizer } from '../../middleware/createMiddleware.ts';
@@ -130,7 +131,7 @@ privateRolesRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeOrganizer] as const
+		middleware: [authMiddleware, authorizeOrganizer] as const
 	}),
 	async (context) => {
 		const body = context.req.valid('json');
@@ -171,7 +172,7 @@ privateRolesRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeOrganizer] as const
+		middleware: [authMiddleware, authorizeOrganizer] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');
@@ -217,7 +218,7 @@ privateRolesRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeOrganizer] as const
+		middleware: [authMiddleware, authorizeOrganizer] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');

src/routes/team/index.ts

@@ -1,7 +1,8 @@
 import { createRoute, OpenAPIHono } from '@hono/zod-openapi';
+import { authMiddleware } from 'src/middleware/auth.ts';
 import { z } from 'zod';
 import { DBTables } from '../../constants/db.ts';
-import { authorizeAdmin, authorizeOrganizer, authorizeVolunteer } from '../../middleware/createMiddleware.ts';
+import { authorizeAdmin, authorizeOrganizer } from '../../middleware/createMiddleware.ts';
 import {
 	type DataResponse,
 	generateDataResponeSchema,
@@ -76,8 +77,7 @@ publicTeamRoutes.openapi(
 				description: 'Successful response',
 				content: { 'application/json': { schema: generatePaginatedResponseSchema(z.array(TeamSchema)) } }
 			}
-		},
-		middleware: [authorizeVolunteer] as const
+		}
 	}),
 	async (context) => {
 		const teams = await getAllTeams(context.env.database);
@@ -134,7 +134,7 @@ protectedTeamRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeAdmin] as const
+		middleware: [authMiddleware, authorizeAdmin] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');
@@ -177,7 +177,7 @@ protectedTeamRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeAdmin] as const
+		middleware: [authMiddleware, authorizeAdmin] as const
 	}),
 	async (context) => {
 		const body = context.req.valid('json');
@@ -218,7 +218,7 @@ protectedTeamRoutes.openapi(
 				content: { 'application/json': { schema: StatusResponseSchema } }
 			}
 		},
-		middleware: [authorizeOrganizer] as const
+		middleware: [authMiddleware, authorizeOrganizer] as const
 	}),
 	async (context) => {
 		const { id } = context.req.valid('param');