@blaasvaer/frmwrk 0.2.0 → 0.2.3

package/connections.js

@@ -4,7 +4,7 @@ const utils = require('./utils');
  * Install connections
  */
 function installconnections ( config ) {
-	FW.connections = FW.connections || {};
+	FW.databases = {};
 
 	let connections_dir = config.root + '/connections/';
 
@@ -14,6 +14,8 @@ function installconnections ( config ) {
 		const connection_files = [];
 
 		files.forEach( file => {
+			let connection_name = file.split('.')[0];
+
 			// Skip file if name start with an underscore
 			if ( file.charAt(0) === '_' )
 				return;
@@ -23,20 +25,13 @@ function installconnections ( config ) {
 				let connection = require( connections_dir + file );
 
 				if ( connection ) {
-					// FW.connections[ path.parse(file).name ] = connection;
-					FW.connections[ file.split('.')[0] ] = connection;
-	
-					// Check for config connection type
-					if ( config.connection && FW.connections[ config.connection ] ) {
-						FW.database = FW.connections[ config.connection ];
-					}
-	
+					FW.databases[ connection_name ] = connection;
+
 					resolve( file );
 				} else {
 					reject( "Loading of connection: " + file + " failed!" );
 				}
-			});
-
+			});			
 			connection_files.push( promise );
 		});
 

package/handle-request.js

@@ -49,8 +49,7 @@ 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]
@@ -62,26 +61,39 @@ async function handleRequest( req, res ) {
 		 */
 		const controller = new Controller( route, req, res, request_url );
 
-		/**
-		 * 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 …`;
+		let response_output = 'Nothing here …';
 
 		switch ( method ) {
 			case 'GET':
-				response_output = await controller.view();
+				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;
+					}
+				}
 		
 				res.statusCode = status_code;
 				res.setHeader( 'Content-Type', content_types[content_type] );

package/index.js

@@ -92,6 +92,16 @@ 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;
 	}
 
@@ -111,7 +121,7 @@ FW = function ( config ) {
 		/**
 		 * Run post install processes here …
 		 */
-// console.log("Install result:", routes);
+
 		})
 	.catch(function( err ) {
 console.log("Install Error:", err);

package/package.json

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

package/router.js

@@ -10,63 +10,37 @@ const url = require('url');
 global.routes = [];
 
 global.ROUTE = function ( route, action, params = null ) {
+	let _route = route.split('/');
+
 	let r = {
-		"controller": route.split('/')[1] == '' ? 'index' : route.split('/')[1],
-		"resource": route.split('/')[2] == '' ? 'index' : route.split('/')[2],
-		"resource_id": route.split('/')[3] == '' ? 'index' : route.split('/')[3],
+		"controller": _route[1] == '' ? 'index' : _route[1],
+		"resource": _route[2] == '' ? '' : _route[2],
+		"resource_id": _route[3] == '' ? '' : _route[3],
 		"route": route,
 		"action": action,
 		"params": params,
 	}
-	// console.log("Router params:", params?.type);
-	// console.log("----------------------");
-	// console.log("Router route:", route);
-	// console.log("Router controller:", r.controller);
-	// console.log("Router resource:", r.resource);
-	// console.log("Router resource_id:", r.resource_id);
-	// console.log("Router route:", r.route);
-	// console.log("Router action:", r.action);
-	// console.log("Router params:", r.params);
+
 	global.routes.push( r );
 };
 
-// function Router ( req, url ) {
-// 	const method = req.method;
-// 	// console.log("Router url:", url);
-// 	// Split url into array
-// 	let url_array = url.pathname.split('/');
-
-// 	// Remove first empty element
-// 	url_array.shift();
-
-// 	// Set controller, resource, resource_id, search, searchParams
-// 	this.controller 	= url_array[0];
-// 	this.resource 		= url_array[1];
-// 	this.resource_id 	= url_array[2];
-// 	this.search 		= url_array[3];
-// 	this.searchParams 	= url_array[4];
-
-// 	// console.log("referer", referer);
-// 	// console.log("url", url);
-// 	// console.log("this.controller", this.controller);
-// 	// console.log("this.resource", this.resource);
-// 	// console.log("this.resource_id", this.resource_id);
-// 	// console.log("this.search", this.search);
-// 	// console.log("this.searchParams", this.searchParams);
-
-// 	return this;
-// };
-
+/**
+ * A route can be either static or dynamic.
+ * A static route is defined in the controllers and dynamic routes will be resolved automatically.
+ * In order to figure out if we have a static route, we check the pathname and match it against the global.routes object.
+ * If we do not find any match we asume the route is dynamic and therefore pass '/api/:resource' on.
+ * @param {string} url The url to find
+ * @returns object
+ */
 function findRoute ( url ) {
-	let pathname = url.pathname;
+	let pathname = url.pathname,
+		url_array = pathname.split('/').filter( e => e );
 
 	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( pathname ) );
 
 	if ( route ) {
 		return route;
 	} else {
-		const url_array = pathname.split('/').filter( e => e );
-		
 		// Check if route is an API call
 		let isAPICall = pathname.split('/')[1] === 'api' ? true : false;
 		
@@ -93,8 +67,19 @@ function findRoute ( url ) {
 				route = global.routes.find( ( obj ) => obj.route === '/api/:resources' );
 				break;
 			case 3:
-				regex = /api\/(?<resource>[a-z_]+)\/(?<id>[0-9]+)/; // match /api/<resource>/<id>
-				route = global.routes.find( ( obj ) => obj.route === '/api/:resources/:id' );
+				// Check for static route with dynamic resource_id
+				let static_route_path = '/' + url_array[0] + '/' + url_array[1] + '/:id';
+				let static_route = global.routes.find( ( obj ) => obj.route === static_route_path );
+
+				// If we don't find a static route we pass on a dynamic
+				if ( ! static_route ) {
+					regex = /api\/(?<resource>[a-z_]+)\/(?<id>[0-9]+)/; // match /api/<resource>/<id>
+					route = global.routes.find( ( obj ) => obj.route === '/api/:resources/:id' );
+				} else {
+					let resource = url_array[1];
+					regex = new RegExp(`\/api\/${resource}\/(?<id>[0-9]+)`); // match /api/resource/<id>
+					route = global.routes.find( ( obj ) => obj.route === '/api/' + url_array[1] + '/:id' );
+				}
 				break;
 			}
 
@@ -114,6 +99,5 @@ function findRoute ( url ) {
 }
 
 module.exports = {
-	// Router,
 	findRoute
 }

package/utils.js

@@ -71,6 +71,15 @@ class Utils {
 	removeTrailingSlashes( url ) {
 		return url.replace(/\/+$/, '');
 	}
+
+	/**
+	 * Removes all starting and trailing slashes from URL
+	 * @param {string} url
+	 * @return {string}	Return the string without trailing slashes.
+	 */
+	removeStartingTrailingSlashes( url ) {
+		return url.replace(/^\/+|\/+$/g, '')
+	}
 }
 
 module.exports = new Utils();

package/package 2.json

@@ -1,30 +0,0 @@
-{
-  "name": "@blaasvaer/frmwrk",
-  "version": "0.1.14",
-  "description": "My personal Node framework",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "patch": "npm version patch --force && npm publish",
-    "major": "npm version major --force && npm publish",
-    "minor": "npm version minor --force && npm publish"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/blaasvaer/frmwrk.git"
-  },
-  "keywords": [
-    "Node",
-    "Framework",
-    "Homebrew"
-  ],
-  "author": "Sam Blåsvær",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://bitbucket.org/blaasvaer/frmwrk/issues"
-  },
-  "homepage": "https://bitbucket.org/blaasvaer/frmwrk#readme",
-  "dependencies": {
-    "serve-handler": "^6.1.3"
-  }
-}