X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=afb-client%2Fapp%2FFrontend%2Fwidgets%2FNotifications%2FTokenRefreshSvc.js;h=4dee196b220d9f3af0737df9f01b9a58253ac8cb;hb=95a5e12dca0e0e0eb93b3dad69e529d737840d38;hp=25cb3a426d7f65dd5c9ae738138a0377e82740a4;hpb=ceafc991147b17a52eab0a26cee5331b647a38f2;p=src%2Fapp-framework-demo.git

diff --git a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
index 25cb3a4..4dee196 100644
--- a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
+++ b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
@@ -34,11 +34,17 @@
 // scope module is load statically before any route is cativated
 angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
 
-    .directive ('tokenRefresh', function($timeout, $http, $location, Notification, AppConfig) {
+    .directive ('tokenRefresh', function($log, $window, $timeout, $location, Notification, AppConfig, AppCall) {
 
     function mymethods(scope, elem, attrs) {
         scope.logged=undefined; // neither thu neither false
-         
+        
+        $window.onbeforeunload = function () {
+            AppCall.get ("token", "reset", {/*query*/}, function () {    
+            $log.log("OPA exit");            
+            });
+        };
+                 
         scope.online = function () {
             elem.addClass    ("online");
             elem.removeClass ("offline");
@@ -51,7 +57,7 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
             scope.logged=false;
         };
         
-        scope.onerror = function(data, errcode, headers) {
+        scope.onerror = function() {
             if (scope.logged !== false)  {
                 Notification.warning ({message: "AppFramework Binder Lost", delay: 5000});
                 scope.offline();
@@ -59,61 +65,74 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
             scope.status = 0;
         };
         
-        scope.onsuccess = function(data, errcode, headers, config) {
-            if (data.request.token) AppConfig.session.token = data.request.token;
-            if (data.request.uuid)  AppConfig.session.uuid  = data.request.uuid;
-            if (data.request.timeout)  AppConfig.session.timeout  = data.request.timeout;
+        scope.onsuccess = function(jresp, errcode) {
+            
+            if (errcode !== 200 || jresp.request.status !== "success") {
+                Notification.warning ({message: "auto-connect :" + jresp.request.info, delay: 10000});
+                scope.offline(); 
+                return false;
+            }
+            
             if (scope.logged !== true)  {
-                Notification.success ({message: "AppFramework Binder Back to Live", delay: 3000});
+                Notification.success ({message: "AppFramework Binder Connected", delay: 3000});
                 scope.online();
-                if (scope.callback) scope.callback();
+                if (scope.callback) scope.callback(jresp);
             }
-            scope.status = 1;
+            
+            scope.status = 1;            
+            return true;
         };
 
         // Check Binder status
         scope.getping = function() {
-
-            var handler = $http.get(AppConfig.session.ping+'?token='+ AppConfig.session.token);
             
-            // process success and error
-            handler.success(scope.onsuccess);
-            handler.error(scope.onerror);
-
-            // restart a new timer for next ping
-            $timeout (scope.getping, AppConfig.session.pingrate*1000);
+            AppCall.get (scope.plugin, "ping", {/*query*/},function(jresp, errcode) {
+                if (errcode !== 200 || jresp.request.status !== "success") {
+                    Notification.warning ({message: jresp.request.info, delay: 5000});
+                    scope.offline(); 
+                    return;
+                }
+                // restart a new timer for next ping
+                $timeout (scope.getping, AppConfig.session.pingrate*1000);
+            }, scope.onerror);
         };
         
         // Check Binder status
         scope.refresh = function() {
-            var handler = $http.get(AppConfig.session.refresh+'?token='+ AppConfig.session.token);
             
-            // process success and error
-            handler.success(scope.onsuccess);
-            handler.error(scope.onerror);
-            // restart a new timer for next refresh to 1/4 of timeout session
-            $timeout (scope.refresh, AppConfig.session.timeout *250);
+            AppCall.get (scope.plugin, "refresh", {/*query*/}, function(jresp, errcode) {
+
+                scope.onsuccess (jresp, errcode);
+                
+                // restart a new timer for next refresh
+                $timeout (scope.refresh, AppConfig.session.timeout *250);
+            }, scope.onerror);            
         };
         
         // Initial connection
-        scope.tkcreate = function() {
-            var handler = $http.get(AppConfig.session.create+'?token='+ AppConfig.session.initial);
-            
-            // process success and error
-            handler.success(scope.onsuccess);
-            handler.error(scope.onerror);
-        };
+        scope.loggin = function() {            
+            AppCall.get (scope.plugin, "connect", {token: AppConfig.session.initial}, function(jresp, errcode) {
+                
+                if (!scope.onsuccess (jresp, errcode)) return;
+                
+                // Intial token was accepted let's start ping & refresh
+                $timeout (scope.getping, AppConfig.session.pingrate*1000);
+                $timeout (scope.refresh, AppConfig.session.timeout *250);
  
+            }, scope.onerror);
+        };
+
+
+        // Parse Widget Parameters
+        scope.plugin    = attrs.plugin || "auth";
         scope.icon      = attrs.icon   || "fi-lightbulb";
         scope.hostname  = $location.host();
         scope.httpdport = $location.port();
         scope.autolog   = JSON.parse(attrs.autolog || false);
         
-        if (scope.autolog) scope.tkcreate();
-
-        // Init ping and refresh process
-        $timeout (scope.getping, AppConfig.session.pingrate*1000);
-        $timeout (scope.refresh, AppConfig.session.timeout *250);
+        // autostart log if requested
+        if (scope.autolog) scope.loggin();
+        
     }
 
     return {
@@ -128,4 +147,3 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
 
 })();
 console.log ("Token Refresh Loaded");
-