From 2ea7ffb3abc8c62cfd5235ba4dbcd040f0235d69 Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Sun, 29 May 2016 12:35:26 +0200
Subject: don't enforce to refresh the token
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4257210371c4b809e93c174e00677a82c4b196c7
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 test/AFB.html   | 2 +-
 test/AFB.js     | 8 +++++++-
 test/websock.js | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/AFB.html b/test/AFB.html
index a1a4bf59..b0832d9a 100644
--- a/test/AFB.html
+++ b/test/AFB.html
@@ -3,7 +3,7 @@
     <title>Test of AFB Echo</title>
     <script type="text/javascript" src="AFB.js"></script>
     <script type="text/javascript">
-	var afb = new AFB("api", "hello-token");
+	var afb = new AFB("api", "hello");
 	var ws;
 
 	function onopen() {
diff --git a/test/AFB.js b/test/AFB.js
index ae2fd8b8..c77e5e60 100644
--- a/test/AFB.js
+++ b/test/AFB.js
@@ -42,7 +42,13 @@ var AFB_websocket;
 	var PROTO1 = "x-afb-ws-json1";
 
 	AFB_websocket = function(onopen, onabort) {
-		this.ws = new WebSocket(urlws, [ PROTO1 ]);
+		var u = urlws;
+		if (AFB_context.token) {
+			u = u + '?x-afb-token=' + AFB_context.token;
+			if (AFB_context.uuid)
+				u = u + '&x-afb-uuid=' + AFB_context.uuid;
+		}
+		this.ws = new WebSocket(u, [ PROTO1 ]);
 		this.pendings = {};
 		this.awaitens = {};
 		this.counter = 0;
diff --git a/test/websock.js b/test/websock.js
index 84465588..c4295536 100644
--- a/test/websock.js
+++ b/test/websock.js
@@ -27,12 +27,18 @@ AfbWsItf = (function(){
 	var RETERR = 4;
 
 	function AfbWsItf(base, onopen, onabort, ctx) {
+		ctx = ctx || new AfbCtxItf();
 		var wl = window.location;
 		var u = "ws://"+wl.host+"/"+base;
+		if (ctx.token) {
+			u = u + '?x-afb-token=' + ctx.token;
+			if (ctx.uuid)
+				u = u + '&x-afb-uuid=' + ctx.uuid;
+		}
 		this.ws = new (WebSocket || MozWebSocket)(u, [ "x-afb-ws-json1" ]);
 		this.pendings = {};
 		this.counter = 0;
-		this.ctx = ctx || new AfbCtxItf();
+		this.ctx = ctx;
 		this.ws.onopen = onopen.bind(this);
 		this.ws.onerror = onerror.bind(this);
 		this.ws.onclose = onclose.bind(this);
-- 
cgit 1.2.3-korg