don't enforce to refresh the token

Change-Id: I4257210371c4b809e93c174e00677a82c4b196c7
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/src/afb-context.c b/src/afb-context.c
index 0492ecb..ba093c3 100644 (file)
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -58,7 +58,7 @@ int afb_context_connect(struct afb_context *context, const char *uuid, const cha
        init_context(context, session, token);
        if (created) {
                context->created = 1;
-               context->refreshing = 1;
+               /* context->refreshing = 1; */
        }
        return 0;
 }

diff --git a/test/AFB.html b/test/AFB.html
index a1a4bf5..b0832d9 100644 (file)
--- 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 ae2fd8b..c77e5e6 100644 (file)
--- 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 8446558..c429553 100644 (file)
--- 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);