@blaasvaer/frmwrk 0.1.19 → 0.2.0

package/handle-request.js

@@ -49,7 +49,8 @@ async function handleRequest( req, res ) {
 	 * Find route in Router based on url
 	 */
 	const route = findRoute( request_url );
-
+	// console.log("request_url", request_url);
+	// console.log("route", route);
 	/**
 	 * Check for complete route
 	 * @param  {[type]} route [description]
@@ -61,39 +62,26 @@ async function handleRequest( req, res ) {
 		 */
 		const controller = new Controller( route, req, res, request_url );
 
-		let response_output = 'Nothing here …';
+		/**
+		 * AUTHORIZATION
+		 * Check for authorization parameters.
+		 */
+		if ( route?.params !== null ) {
+			// console.log("Params not null", route.params);
+			let _redirect = (route.params?.redirect) ? route.params.redirect : '/login';
+
+			if ( route?.params?.authorize === true ) {
+				console.log("This route should be authorized!");
+				res.writeHead(301, { "Location": "http://" + req.headers['host'] + _redirect });
+				return res.end();
+			}
+		}
+
+		let response_output = `Nothing here …`;
 
 		switch ( method ) {
 			case 'GET':
-				if ( ! controller.route.params ) {
-					/**
-					 * If the route has no parameters, then just run the route method and serve whatever it may …
-					 */
-					response_output = await controller.view();
-				} else {
-					/**
-					 * Authorization
-					 */
-					if ( Authorize( controller.route ) ) {
-						response_output = await controller.view();
-					} else {
-						/**
-						 * Redirect the user to login if auth fails
-						 */
-						if ( controller.route.params.access.redirect ) {
-							status_code = 302;
-							res.setHeader( 'Location', controller.route.params.access.redirect );
-						}
-						// console.log("NO USER", controller.route.params.redirect);
-						// response_output = redirect.action.call();
-						// route.params.redirect.call();
-						// response_output = 'Access denied';
-					}
-					
-					if ( controller.route.params.type ) {
-						content_type = controller.route.params.type;
-					}
-				}
+				response_output = await controller.view();
 		
 				res.statusCode = status_code;
 				res.setHeader( 'Content-Type', content_types[content_type] );

package/index.js

@@ -92,16 +92,6 @@ FW = function ( config ) {
 			return output;
 		}
 
-		/**
-		 * Check for authorization parameters.
-		 */
-		if ( route.params !== null ) {
-// console.log("Params not null", route.params);
-			if ( route.params.access !== undefined ) {
-console.log("This route should be authorized!");
-			}
-		}
-			
 		return this;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaasvaer/frmwrk",
-  "version": "0.1.19",
+  "version": "0.2.0",
   "description": "My personal Node framework",
   "main": "index.js",
   "scripts": {

package/.vscode/settings.json

@@ -1,22 +0,0 @@
-{
-	"workbench.colorCustomizations": {
-		"activityBar.activeBackground": "#2f7c47",
-		"activityBar.activeBorder": "#422c74",
-		"activityBar.background": "#2f7c47",
-		"activityBar.foreground": "#e7e7e7",
-		"activityBar.inactiveForeground": "#e7e7e799",
-		"activityBarBadge.background": "#422c74",
-		"activityBarBadge.foreground": "#e7e7e7",
-		"statusBar.background": "#215732",
-		"statusBar.foreground": "#e7e7e7",
-		"statusBarItem.hoverBackground": "#2f7c47",
-		"titleBar.activeBackground": "#215732",
-		"titleBar.activeForeground": "#e7e7e7",
-		"titleBar.inactiveBackground": "#21573299",
-		"titleBar.inactiveForeground": "#e7e7e799",
-		"sash.hoverBorder": "#2f7c47",
-		"statusBarItem.remoteBackground": "#215732",
-		"statusBarItem.remoteForeground": "#e7e7e7"
-	},
-	"peacock.color": "#215732"
-}