total5 0.0.10-1 → 0.0.10-2

package/changelog.txt

@@ -3,6 +3,7 @@
 ========================
 
 - improved HTMLParser parser
+- extended `Flow.socket(flow, socket, [verify(client)], [check(client, msg)])` by adding `check` argument for verifying permissions
 
 ========================
 0.0.9

package/flow-flowstream.js

@@ -1753,7 +1753,7 @@ exports.io = function(flowstreamid, id, callback) {
 	});
 };
 
-exports.socket = function(flow, socket, check) {
+exports.socket = function(flow, socket, verify, check) {
 
 	if (typeof(flow) === 'string')
 		flow = FLOWS[flow];
@@ -1779,8 +1779,8 @@ exports.socket = function(flow, socket, check) {
 	};
 
 	socket.on('open', function(client) {
-		if (check)
-			check(client, () => newclient(client));
+		if (verify)
+			verify(client, () => newclient(client));
 		else
 			newclient(client);
 	});
@@ -1807,6 +1807,17 @@ exports.socket = function(flow, socket, check) {
 
 	socket.on('message', function(client, msg) {
 		if (client.isflowstreamready) {
+
+			// It can check permissions
+			if (check) {
+				let err = check(client, msg);
+				if (err !== true) {
+					if (msg.callbackid)
+						client.send({ callbackid: msg.callbackid, error: typeof(err) === 'string' ? err : '401' });
+					return;
+				}
+			}
+
 			if (flow.isworkerthread)
 				flow.postMessage2({ TYPE: 'ui/message', clientid: client.id, data: msg });
 			else

package/package.json

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