@stonyx/rest-server 0.2.1-alpha.2 → 0.2.1-alpha.4

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.2.1-alpha.2",
+  "version": "0.2.1-alpha.4",
   "description": "Rest Server Module for Stonyx Framework",
   "repository": {
     "type": "git",
@@ -27,10 +27,10 @@
   "dependencies": {
     "cors": "^2.8.5",
     "express": "^5.1.0",
-    "stonyx": "0.2.3-beta.2"
+    "stonyx": "0.2.3-beta.4"
   },
   "devDependencies": {
-    "@stonyx/utils": "0.2.3-beta.3",
+    "@stonyx/utils": "0.2.3-beta.4",
     "qunit": "^2.24.1",
     "sinon": "^21.0.0"
   },

package/src/main.js

@@ -75,17 +75,12 @@ export default class RestServer {
     const { api } = this;
     const classInstance = new routeClass(options);
     const route = name === 'index' ? '/' : `/${name}`;
-    const { expressInstance, authorization } = classInstance;
-    
-    const routeCalls = [ expressInstance ];
-
-    // Assign auth callback if it exists
-    if (authorization) routeCalls.unshift(authorization.bind(classInstance));
+    const { expressInstance } = classInstance;
 
     classInstance.registerCalls();
     expressInstance.mountpath = route;
-    
+
     // Mount handler to main api instance
-    api.use(route, ...routeCalls);
+    api.use(route, expressInstance);
   }
 }

package/src/request.js

@@ -29,20 +29,10 @@ export default class Request {
     this.expressInstance = api;
   }
 
-  // auth hook wrapper
-  authorization(req, res, next) {
-    if (!this.auth) return next();
-
-    const status = this.auth(req, Request.getState(req));
-    if (status) return Request.sendStatusResponse(res, status);
-
-    next();
-  }
-
   registerCalls() {
     const { expressInstance } = this;
-    const { getState } = Request;
-    
+    const { getState, sendStatusResponse } = Request;
+
     for (const [method, handlers] of Object.entries(this.handlers)) {
       if (!METHODS.has(method)) {
         console.warn(`Method "${method}" is not a valid HTTP method. Skipping...`);
@@ -51,9 +41,14 @@ export default class Request {
 
       for (const [route, handler] of Object.entries(handlers)) {
         expressInstance[method](route, async (req, res) => {
+          // Run auth after route matching so request.params is populated
+          if (this.auth) {
+            const status = this.auth(req, getState(req));
+            if (status) return sendStatusResponse(res, status);
+          }
+
           const callStack = [...makeArray(handler)];
           const mainCall = callStack.pop();
-          const { sendStatusResponse } = Request;
           let response;
 
           // Run middleware
@@ -64,7 +59,11 @@ export default class Request {
 
           if (response === undefined) response = await mainCall(req, getState(req));
           if (Number.isInteger(response)) return sendStatusResponse(res, response);
-          
+
+          // Handle redirect if set via call state object
+          const { redirect } = getState(req);
+          if (redirect) return res.redirect(redirect);
+
           // Handle pipe if set via call state object
           const { pipe } = getState(req);
           if (pipe) {