Merge pull request #1 from StatelessStudio/tests

Tests

Author: JustinC987

src/endpoints/delete.ts

@@ -11,7 +11,9 @@ export async function deleteEndpoint(request: Request, response: Response) {
 	// Check response
 	if (request.payload && request.payload instanceof BaseModel) {
 		// Run model hook
-		runHook(request, response, 'delete', request.params);
+		if (!await runHook(request, response, 'delete', request.params)) {
+			return;
+		}
 
 		// Delete
 		await request.repository

src/endpoints/get.ts

@@ -15,7 +15,9 @@ export async function getEndpoint(request: Request, response: Response) {
 			request.payload instanceof BaseModel)
 	) {
 		// Run model hook
-		runHook(request, response, 'get', request.payload);
+		if (!await runHook(request, response, 'get', request.payload)) {
+			return;
+		}
 
 		response.getResponder(request.payload, response);
 	}

src/endpoints/login.ts

@@ -10,7 +10,9 @@ export async function loginEndpoint(
 	next: NextFunction
 ) {
 	// Run model hook
-	runHook(request, response, 'login', request.body);
+	if (!await runHook(request, response, 'login', request.body)) {
+		return;
+	}
 
 	// Delete undefined members
 	for (const key in request.body) {

src/endpoints/post.ts

@@ -4,7 +4,9 @@ import { runHook } from '../run-hook';
 
 export async function postEndpoint(request: Request, response: Response) {
 	// Run model hook
-	runHook(request, response, 'post', request.body);
+	if (!await runHook(request, response, 'post', request.body)) {
+		return;
+	}
 
 	// Delete undefined members
 	for (const key in request.body) {
@@ -14,10 +16,12 @@ export async function postEndpoint(request: Request, response: Response) {
 	}
 
 	// Validate
-	const errors = await validate(request.body);
+	const errors = await validate(request.body).catch((error) =>
+		response.error(error, response)
+	);
 
 	// Check
-	if (errors.length) {
+	if (errors && errors.length) {
 		return response.validationResponder(errors, response);
 	}
 

src/endpoints/put.ts

@@ -5,7 +5,9 @@ import { runHook } from '../run-hook';
 
 export async function putEndpoint(request: Request, response: Response) {
 	// Run model hook
-	runHook(request, response, 'put', request.params);
+	if (!await runHook(request, response, 'put', request.params)) {
+		return;
+	}
 
 	// Delete undefined members
 	for (const key in request.body) {
@@ -14,6 +16,9 @@ export async function putEndpoint(request: Request, response: Response) {
 		}
 	}
 
+	// Merge payload and request body
+	request.body = Object.assign(request.payload, request.body);
+
 	// Validate
 	const errors = await validate(request.body);
 

src/middleware/get-query.ts

@@ -29,7 +29,9 @@ export async function getQuery(
 	next?: NextFunction
 ) {
 	// Run model hook
-	runHook(request, response, 'getQuery', request.query);
+	if (!await runHook(request, response, 'getQuery', request.query)) {
+		return;
+	}
 
 	// Delete undefined members
 	for (const key in request.query) {

src/responders/post.ts

@@ -4,9 +4,8 @@ export function postResponder(result: any, response: Response) {
 	// Result should have ID
 	if (result instanceof Object && 'id' in result) {
 		// Send response
-		response.json({
-			id: result.id
-		});
+		// TODO: Filter out senstive info in body
+		response.json(result);
 	}
 	else {
 		// Send error

src/run-hook.ts

@@ -17,4 +17,6 @@ export async function runHook(
 			return result;
 		}
 	}
+
+	return true;
 }

test/examples/basic/routes/auth.ts

@@ -5,7 +5,6 @@ const ROOT_PATH = require('app-root-path').toString();
 
 // Routes
 import { userRouter } from './routes/user';
-import { authRouter } from './routes/auth';
 
 // Setup
 pointy.before = async (app) => {
@@ -17,7 +16,6 @@ pointy.before = async (app) => {
 
 	// Routes
 	app.use('/api/v1/user', userRouter);
-	app.use('/api/v1/auth', authRouter);
 
 	// Database
 	await pointy.db