organise middleware

Author: ashtonjamesd

doc/api/validator.md

@@ -13,11 +13,9 @@ middleware(registerUserValidator, ctx, m) {
     required(&v, "username");
     required(&v, "password");
 
-    char *error = validate(&v, ctx.body);
-    if (error) {
-        return failure(error);
+    if (!validate(&v, ctx.body)) {
+        return apiFailure(v.error);
     }
-    freeValidator(&v);
 
     return next(ctx, m);
 }

examples/basic/middleware.c

@@ -9,7 +9,7 @@ int main() {
     App app = build(builder);
 
     // Logging middleware example
-    useMiddleware(&builder, logger);
+    useMiddleware(&builder, consoleLogger);
 
     get(&app, "/home", home);
 

examples/basic/route_middleware.c

@@ -21,7 +21,7 @@ int main() {
 
     // sets up middleware specific to this route
     Route homeRoute = root(&app, home);
-    useRouteMiddleware(&homeRoute, logger);
+    useRouteMiddleware(&homeRoute, consoleLogger);
 
     runApp(&app);
 }

examples/foodApp/app/middleware/validators.c

@@ -10,11 +10,9 @@ middleware(registerUserValidator, ctx, m) {
     required(&v, "name");
     required(&v, "password");
 
-    char *error = validate(&v, ctx.body);
-    if (error) {
-        return apiFailure(error);
+    if (!validate(&v, ctx.body)) {
+        return apiFailure(v.error);
     }
-    freeValidator(&v);
 
     return next(ctx, m);
 }
@@ -25,11 +23,9 @@ middleware(loginUserValidator, ctx, m) {
     required(&v, "username");
     required(&v, "password");
 
-    char *error = validate(&v, ctx.body);
-    if (error) {
-        return apiFailure(error);
+    if (!validate(&v, ctx.body)) {
+        return apiFailure(v.error);
     }
-    freeValidator(&v);
 
     return next(ctx, m);
 }

examples/foodApp/app/routes.c

@@ -4,14 +4,13 @@
 #include "middleware/middleware.h"
 
 void registerRoutes(App *app) {
-    Route registerUserRoute = get(app, "/api/register", registerUser);
+    Route registerUserRoute = post(app, "/api/register", registerUser);
     useLocalMiddleware(&registerUserRoute, registerUserValidator);
 
     Route loginUserRoute = post(app, "/api/login", loginUser);
     useLocalMiddleware(&loginUserRoute, loginUserValidator);
 
-    Route logoutUserRoute = post(app, "/api/logout", logoutUser);
-    useLocalMiddleware(&logoutUserRoute, logoutUserValidator);
+    post(app, "/api/logout", logoutUser);
 
     get(app, "/api/getFoodBanks", getFoodBanks);
     get(app, "/api/getFoodBank", getFoodBank);