total5 0.0.1-8 → 0.0.1-9

package/controller.js

@@ -806,7 +806,6 @@ Controller.prototype.$route = function() {
 	}
 
 	let route = F.TRouting.lookup(ctrl);
-
 	if (route) {
 
 		ctrl.route = route;
@@ -1018,8 +1017,14 @@ function execute(ctrl) {
 
 				let schema = body.schema.split('/');
 				let endpoint = ctrl.route.api[schema[0]];
-				let params = {};
 				if (endpoint) {
+
+					if ((endpoint.auth === 1 && ctrl.user == null) || (endpoint.auth === 2 && ctrl.user)) {
+						ctrl.fallback(401);
+						return;
+					}
+
+					let params = {};
 					if (endpoint.params) {
 						for (let m of endpoint.params)
 							params[m.name] = schema[m.index] || '';

package/index.js

@@ -1339,7 +1339,7 @@ F.componentator = function(name, components, removeprev = true) {
 
 	F.Fs.lstat(filename, function(err) {
 		if (err)
-			F.download(url, filename, F.error('COMPONENTATOR'));
+			F.download(url, filename, err => err ? F.error(err, 'COMPONENTATOR') : null);
 	});
 
 };
@@ -2203,7 +2203,7 @@ F.backup = function(filename, files, callback, filter) {
 			F.Fs.stat(file, function(err, stats) {
 
 				if (err) {
-					F.error(err, 'BACKUP()', filename);
+					F.error(err, 'F.backup()', filename);
 					next();
 					return;
 				}
@@ -2289,7 +2289,7 @@ F.backup = function(filename, files, callback, filter) {
 					counter++;
 					setImmediate(next);
 				}).on('error', function(err) {
-					F.error(err, 'F.backup', file);
+					F.error(err, 'F.backup()', file);
 					setImmediate(next);
 				});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.1-8",
+  "version": "0.0.1-9",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/routing.js

@@ -155,6 +155,7 @@ function Route(url, action, size) {
 
 	if (t.method === 'API') {
 		t.method = 'POST';
+		t.id = t.id.replace(/^(\+|-)/, '');
 		url = url.replace(/(\*|\+|-|%)?[a-z0-9-_/{}]+/i, function(text) {
 			let tmp = text.trim();
 			endpoint = tmp.substring(1);
@@ -215,6 +216,10 @@ function Route(url, action, size) {
 		}
 
 		delete t.actions;
+
+		// Reset auth
+		t.auth = 0;
+
 	} else
 		t.actions = t.actions.join(',');
 
@@ -446,7 +451,7 @@ function compareflags(ctrl, routes, auth) {
 	}
 }
 
-exports.lookup = function(ctrl, auth, skip) {
+exports.lookup = function(ctrl, auth = 0, skip = false) {
 
 	// auth 0: does not matter
 	// auth 1: logged
@@ -593,7 +598,7 @@ exports.lookupcors = function(ctrl) {
 
 };
 
-exports.lookupfile = function(ctrl, auth) {
+exports.lookupfile = function(ctrl, auth = 0) {
 	if (F.routes.files.length) {
 
 		// fixed
@@ -611,7 +616,7 @@ exports.lookupfile = function(ctrl, auth) {
 	}
 };
 
-exports.lookupwebsocket = function(ctrl, auth, skip = false) {
+exports.lookupwebsocket = function(ctrl, auth = 0, skip = false) {
 
 	// auth 0: does not matter
 	// auth 1: logged