X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=blobdiff_plain;f=test%2Fmonitoring%2FAFB.js;h=e74fbe95d993415caf61e71ffa636c450843cd72;hp=aa634168e2058653832756e0a49485d43179a9c7;hb=65353dce81a629e042800bb7b86fcd869a76727e;hpb=e36f8d572ca660f5c06fe45297d13c7a6818cc65

diff --git a/test/monitoring/AFB.js b/test/monitoring/AFB.js
index aa634168..e74fbe95 100644
--- a/test/monitoring/AFB.js
+++ b/test/monitoring/AFB.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,10 @@ if (typeof base != "object")
 
 var initial = {
 	base: base.base || "api",
-	token: base.token || initialtoken || "HELLO",
+	token: initialtoken || base.token 
+		|| URLSearchParams(window.location.search).get('access_token')
+		|| URLSearchParams(window.location.search).get('token')
+		|| "HELLO",
 	host: base.host || window.location.host,
 	url: base.url || undefined
 };
@@ -92,7 +95,7 @@ var AFB_websocket;
 		if (f) {
 			delete this.onopen;
 			delete this.onabort;
-			f && f(this);
+			f(this);
 		}
 		this.onerror && this.onerror(this);
 	}
@@ -122,16 +125,16 @@ var AFB_websocket;
 	function fire(awaitens, name, data) {
 		var a = awaitens[name];
 		if (a)
-			a.forEach(function(handler){handler(data);});
+			a.forEach(function(handler){handler(data, name);});
 		var i = name.indexOf("/");
 		if (i >= 0) {
 			a = awaitens[name.substring(0,i)];
 			if (a)
-				a.forEach(function(handler){handler(data);});
+				a.forEach(function(handler){handler(data, name);});
 		}
 		a = awaitens["*"];
 		if (a)
-			a.forEach(function(handler){handler(data);});
+			a.forEach(function(handler){handler(data, name);});
 	}
 
 	function reply(pendings, id, ans, offset) {
@@ -151,14 +154,14 @@ var AFB_websocket;
 		switch (code) {
 		case RETOK:
 			reply(this.pendings, id, ans, 0);
-			break; 
+			break;
 		case RETERR:
 			reply(this.pendings, id, ans, 1);
-			break; 
+			break;
 		case EVENT:
 		default:
 			fire(this.awaitens, id, ans);
-			break; 
+			break;
 		}
 	}