AFB.js: Improve default token discovery

[src/app-framework-binder.git] / test / AFB.js

diff --git a/test/AFB.js b/test/AFB.js
index aa63416..4c500b9 100644 (file)
--- a/test/AFB.js
+++ b/test/AFB.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2017-2019 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ if (typeof base != "object")
 
 var initial = {
        base: base.base || "api",
-       token: base.token || initialtoken || "HELLO",
+       token: initialtoken || base.token || URLSearchParams(window.location.search).get('token') || "HELLO",
        host: base.host || window.location.host,
        url: base.url || undefined
 };
@@ -92,7 +92,7 @@ var AFB_websocket;
                if (f) {
                        delete this.onopen;
                        delete this.onabort;
-                       f && f(this);
+                       f(this);
                }
                this.onerror && this.onerror(this);
        }
@@ -151,14 +151,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;
                }
        }