alchemymvc 1.2.2 → 1.2.5

package/lib/class/model.js

@@ -317,7 +317,7 @@ Model.prepareProperty('sort', function sort() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String}   value       The value in the url
  * @param    {String}   name        The name of the url parameter
@@ -326,7 +326,7 @@ Model.prepareProperty('sort', function sort() {
  *
  * @return   {Pledge}
  */
-Model.setStatic(function checkPathValue(value, name, field_name, conduit) {
+Model.setStatic(async function checkPathValue(value, name, field_name, conduit) {
 
 	var instance,
 	    pledge,
@@ -352,9 +352,17 @@ Model.setStatic(function checkPathValue(value, name, field_name, conduit) {
 	// Look for the wanted field
 	crit.where(field_name).equals(value);
 
-	pledge = instance.find('first', crit);
+	let result = await instance.find('first', crit);
 
-	return pledge;
+	if (result) {
+		let found_value = result[field_name];
+
+		if (found_value != value && !Object.alike(value, found_value)) {
+			conduit.rewriteRequestRouteParam(name, found_value);
+		}
+	}
+
+	return result;
 });
 
 /**
@@ -362,7 +370,7 @@ Model.setStatic(function checkPathValue(value, name, field_name, conduit) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.7
+ * @version  1.2.4
  *
  * @return   {Alchemy.Field}
  */
@@ -380,12 +388,10 @@ Model.setStatic(function addField(name, type, options) {
 		// Add it to the Document class
 		this.Document.setFieldGetter(name);
 
-		// Add the field to the client document too, if it's not private
-		if (!field.is_private) {
-			// False means it should not be set on the server implementation
-			// (because that's where it's coming from)
-			this.ClientDocument.setFieldGetter(name, null, null, false);
-		}
+		// False means it should not be set on the server implementation
+		// (because that's where it's coming from)
+		// Yes, this also sets private fields on the server-side client document.
+		this.ClientDocument.setFieldGetter(name, null, null, false);
 	}
 
 	return field;
@@ -409,18 +415,16 @@ Model.setStatic(function addBehaviour(behaviour_name, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.2.4
  */
 Model.setStatic(function addAssociation(type, alias, model_name, options) {
 	var data = this.schema.addAssociation(type, alias, model_name, options);
 	this.Document.setAliasGetter(data.alias);
 
-	// Add the alias to the client document too, if it's not private
-	if (!options || !options.is_private) {
-		// False means it should not be set on the server implementation
-		// (because that's where it's coming from)
-		this.ClientDocument.setAliasGetter(name);
-	}
+	// False means it should not be set on the server implementation
+	// (because that's where it's coming from)
+	// Yes, this also sets private fields on the server-side client document.
+	this.ClientDocument.setAliasGetter(name);
 });
 
 /**

package/lib/class/route.js

@@ -3,7 +3,7 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.5
  */
 var Route = Function.inherits('Alchemy.Base', function Route(router, paths, options) {
 
@@ -41,6 +41,10 @@ var Route = Function.inherits('Alchemy.Base', function Route(router, paths, opti
 	this.breadcrumb = '';
 	this.has_breadcrumb_assignments = false;
 
+	// The optional permissions to check
+	this.permission = null;
+	this.has_permission_assignments = false;
+
 	// If no fnc is given, these will be called
 	this.controller = null;
 	this.action = null;
@@ -84,6 +88,35 @@ Route.setMethod(function setBreadcrumb(breadcrumb) {
 	this.breadcrumb = breadcrumb;
 });
 
+/**
+ * Set the permissions for this route
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|String[]}   permission
+ */
+Route.setMethod(function setPermission(permission) {
+
+	if (!permission) {
+		return;
+	}
+
+	permission = Array.cast(permission);
+
+	this.permission = permission;
+
+	for (let entry of permission) {
+		let assignments = entry.assignments();
+
+		if (assignments.length) {
+			this.has_permission_assignments = true;
+			break;
+		}
+	}
+});
+
 /**
  * Compile paths for this route
  *
@@ -135,7 +168,7 @@ Route.setMethod(function setPaths(paths) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.3
+ * @version  1.2.5
  *
  * @param    {String}   method
  * @param    {String}   path     The path (without the prefix)
@@ -145,19 +178,13 @@ Route.setMethod(function setPaths(paths) {
  */
 Route.setMethod(function match(conduit, method, path, prefix) {
 
-	var definition,
-	    params,
-	    pledge,
-	    result,
-	    temp,
-	    type,
-	    i;
+	conduit.markRouteAsTested(this);
 
 	if (this.methods && this.methods.indexOf(method) == -1) {
 		return false;
 	}
 
-	result = false;
+	let result = false;
 
 	if (!prefix) {
 		prefix = '';
@@ -181,17 +208,17 @@ Route.setMethod(function match(conduit, method, path, prefix) {
 	if (this.paths[prefix]) {
 
 		// Get the path definition, including the regex & keys array
-		definition = this.paths[prefix];
+		let definition = this.paths[prefix];
 
 		// Test it
-		temp = definition.test(path, conduit);
+		let temp = definition.test(path, conduit);
 
 		if (!temp) {
 			return false;
 		}
 
 		if (temp.then) {
-			pledge = new Blast.Classes.Pledge();
+			let pledge = new Blast.Classes.Pledge();
 
 			temp.then(function gotValue(values) {
 
@@ -295,12 +322,48 @@ Route.setMethod(function checkPolicy(conduit) {
 	return false;
 });
 
+/**
+ * Check the permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Conduit}   conduit
+ */
+Route.setMethod(function checkPermission(conduit) {
+
+	// Check the rouer section first
+	if (!this.router.checkPermission(conduit)) {
+		return false;
+	}
+
+	if (!this.permission) {
+		return true;
+	}
+
+	let permission;
+
+	for (permission of this.permission) {
+
+		if (this.has_permission_assignments) {
+			permission = permission.assign(conduit.route_string_parameters).toLowerCase();
+		}
+
+		if (conduit.hasPermission(permission)) {
+			return true;
+		}
+	}
+
+	return false;
+});
+
 /**
  * Call the handler for this route
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.2.5
  *
  * @param    {Conduit}   conduit
  * @param    {Array}     parameters
@@ -314,6 +377,17 @@ Route.setMethod(async function callHandler(conduit, parameters) {
 
 	if (this.fnc) {
 
+		if (!this.checkPermission(conduit)) {
+
+			let user = conduit.session('UserData');
+
+			if (!user) {
+				return conduit.notAuthorized();
+			} else {
+				return conduit.forbidden();
+			}
+		}
+
 		if (this.options.policy && !await this.checkPolicy(conduit)) {
 			return conduit.notAuthorized();
 		}
@@ -403,25 +477,20 @@ Route.setMethod(async function callHandler(conduit, parameters) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  0.5.0
+ * @version  1.2.5
  *
  * @param    {Object}                  parameters  (optional)
  * @param    {Object|Alchemy.Conduit}  conduit     Conduit or options (optional)
  */
 Route.setMethod(function generateUrl(parameters, conduit) {
 
-	var locale,
-	    mount,
-	    path,
-	    url,
-	    i;
-
 	// Use the "no locale" by default
-	locale = '';
+	let locale = '';
 
 	// If a conduit is given, get the locale
 	if (conduit) {
 		if (conduit.locales) {
+			let i;
 			for (i = 0; i < conduit.locales.length; i++) {
 				if (this.paths[conduit.locales[i]]) {
 					locale = conduit.locales[i];
@@ -435,45 +504,7 @@ Route.setMethod(function generateUrl(parameters, conduit) {
 		}
 	}
 
-	// Get the path to use for the url generation
-	path = this.paths[locale];
-
-	if (!path) {
-		return null;
-	}
-
-	if (path && path.source) {
-		path = path.source;
-	}
-
-	// Remove type definitions from the path
-	path = path.replace(/\[.*\]\:/g, ':');
-
-	if (!parameters && conduit) {
-		if (conduit.param) {
-			parameters = conduit.param();
-		} else if (conduit.parameters) {
-			paramers = conduit.parameters;
-		}
-	}
-
-	if (parameters) {
-		url = path.fillPlaceholders(parameters, true);
-	} else {
-		url = path;
-	}
-
-	mount = this.router.getFullMount();
-
-	if (mount.length > 1) {
-		url = mount + url;
-	}
-
-	if (locale) {
-		url = '/' + locale + url;
-	}
-
-	return url;
+	return Router.getUrl(this.name, parameters, {locale});
 });
 
 /**

package/lib/class/router.js

@@ -12,7 +12,7 @@ var Url = alchemy.use('url'),
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  */
 var RouterClass = Function.inherits('Alchemy.Base', function Router(name, mount, parent) {
 
@@ -52,6 +52,9 @@ var RouterClass = Function.inherits('Alchemy.Base', function Router(name, mount,
 	// Routes inside this router
 	this.routes = new Deck();
 
+	// Optional permissions to check for
+	this.permissions = null;
+
 	this.generateSectionIdentifier();
 });
 
@@ -67,6 +70,66 @@ RouterClass.setProperty('default_route_settings', {
 	weight : 10
 });
 
+/**
+ * Add a required permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String|String[]}   permission
+ */
+RouterClass.setMethod(function requirePermission(permission) {
+
+	if (!permission) {
+		return;
+	}
+
+	if (!this.permissions) {
+		this.permissions = [];
+	}
+
+	this.permissions.include(permission);
+});
+
+/**
+ * Check the permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Conduit}   conduit
+ *
+ * @return   {Boolean}
+ */
+RouterClass.setMethod(function checkPermission(conduit) {
+
+	// Does this section require a permission?
+	if (this.permissions?.length) {
+		let permission,
+		    has_permission;
+
+		for (permission of this.permissions) {
+			if (conduit.hasPermission(permission)) {
+				has_permission = true;
+				break;
+			}
+		}
+
+		if (!has_permission) {
+			return false;
+		}
+	}
+
+	// If this section has a parent, check those permissions too
+	if (this.parent) {
+		return this.parent.checkPermission(conduit);
+	}
+
+	return true;
+});
+
 /**
  * Get the complete section identifier
  *
@@ -424,7 +487,7 @@ RouterClass.setMethod(function getRouteByName(name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.5
  *
  * @param    {Conduit}  conduit
  * @param    {Router}   section
@@ -462,6 +525,16 @@ RouterClass.setMethod(async function getMiddleware(conduit, section, path, prefi
 		for (i = 0; i < routes.length; i++) {
 			route = routes[i];
 
+			// If this route matches the main route of the conduit,
+			// don't look for more middleware in this section
+			if (conduit.route && conduit.route == route) {
+				break;
+			}
+
+			if (conduit.hasRouteBeenTested(route)) {
+				continue;
+			}
+
 			if (route.is_middleware) {
 
 				temp = route.match(conduit, conduit.method, sectionPath, prefix);
@@ -690,7 +763,7 @@ RouterClass.setMethod(function setOption(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Object}   args
  * @param    {String}   args.name            Optional route name
@@ -741,6 +814,10 @@ RouterClass.setMethod(function add(args) {
 	route.methods = args.methods;
 	route.setBreadcrumb(args.breadcrumb);
 
+	if (args.permission) {
+		route.setPermission(args.permission);
+	}
+
 	if (args.breadcrumb) {
 		breadcrumb_options = {
 			route : route

package/lib/class/schema.js

@@ -287,7 +287,7 @@ Schema.setMethod(function getAssociationArguments(locality, alias, modelName, op
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.2
+ * @version  1.2.4
  *
  * @param    {String}   alias
  * @param    {String}   modelname
@@ -382,7 +382,8 @@ Schema.setMethod(function addAssociation(type, alias, modelName, options) {
 				doc_class.setFieldGetter(options.localKey);
 			}
 
-			if (client_doc && !options.is_private) {
+			// Also set is_private fields on the server-side client_doc!
+			if (client_doc) {
 				client_doc.setFieldGetter(options.localKey, null, null, false);
 			}
 		}
@@ -396,7 +397,8 @@ Schema.setMethod(function addAssociation(type, alias, modelName, options) {
 	if (constructor) {
 		doc_class.setAliasGetter(alias);
 
-		if (client_doc && !options.is_private) {
+		// Also set is_private fields on the server-side client_doc!
+		if (client_doc) {
 			client_doc.setAliasGetter(alias);
 		}
 	}

package/lib/class/schema_client.js

@@ -414,6 +414,37 @@ Schema.setMethod(function toHawkejs(wm) {
 	return result;
 });
 
+/**
+ * Get all the private fields
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ *
+ * @return   {Array}
+ */
+Schema.setMethod(function getPrivateFields() {
+
+	let result = [],
+	    field,
+	    i;
+
+	// Get the sorted fields
+	let fields = this.getSorted(false);
+
+	for (i = 0; i < fields.length; i++) {
+		field = fields[i];
+
+		if (field.is_private) {
+			field = Object.create(field);
+			field.schema = null;
+			result.push(field);
+		}
+	}
+
+	return result;
+});
+
 /**
  * Add a field to this schema
  *
@@ -606,7 +637,7 @@ Schema.setMethod(function getField(name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {String}   name
  *
@@ -629,9 +660,14 @@ Schema.setMethod(function getFieldChain(name) {
 		// Iterate over all the pieces
 		for (i = 0; i <= max; i++) {
 			current = current.get(pieces[i]);
+
+			if (!current || typeof current == 'function') {
+				break;
+			}
+
 			result.push(current);
 
-			if (!current || i == max) {
+			if (i == max) {
 				break;
 			}
 

package/lib/core/base.js

@@ -345,7 +345,7 @@ Base.setStatic('starts_new_group', false);
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.8
- * @version  1.1.8
+ * @version  1.2.4
  *
  * @type     {Conduit}
  */
@@ -355,16 +355,20 @@ Base.setProperty(function conduit() {
 		return this[CONDUIT];
 	}
 
-	let renderer = this.renderer || this.view || this.hawkejs_view,
+	let renderer,
 	    result;
+	
+	if (Blast.isBrowser || !(this instanceof Classes.Alchemy.Controller)) {
+		renderer = this.renderer || this.view || this.hawkejs_view;
+	}
 
-	if (renderer && renderer.conduit) {
+	if (renderer?.conduit) {
 		result = renderer.conduit;
-	} else if (renderer && renderer.root_renderer && renderer.root_renderer.conduit) {
+	} else if (renderer?.root_renderer?.conduit) {
 		result = renderer.root_renderer.conduit;
 	}
 
-	if (!conduit && renderer && renderer.server_var) {
+	if (!conduit && renderer?.server_var) {
 		result = renderer.server_var('conduit');
 	}
 
@@ -448,6 +452,39 @@ Base.setMethod(function callOrNext(name, args, next) {
 
 // PROTOBLAST START CUT
 
+/**
+ * Get the client implementation of this class
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ *
+ * @return   {Function}
+ */
+Base.setStatic(function getClientClass() {
+
+	if (!this.namespace) {
+		return;
+	}
+
+	// It's already a client-side class!
+	if (this.namespace.indexOf('.Client.')) {
+		return this;
+	}
+
+	// Add the Client part of the namespace
+	let namespace = this.namespace.replace('.Alchemy.', '.Alchemy.Client.');
+
+	// Get the actual namespace object
+	namespace = Function.getNamespace(namespace);
+
+	if (!namespace) {
+		return;
+	}
+
+	return namespace[this.name];
+});
+
 /**
  * Attach a conduit to a certain instance
  *