X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=afb-client%2Fapp%2FFrontend%2Fwidgets%2FNotifications%2FTokenRefreshSvc.js;h=c4a086eebe62c9f6db41e4b804dc7b9adb5a715d;hb=fb1353dbc12ae889c17a6aa1572b917f57de0f9d;hp=0d1cf3840f70e38dcca942541a71ed11044f0f68;hpb=4136c1506e0c894e604ec069339313987a7e05e7;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 0d1cf38..c4a086e 100644
--- a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
+++ b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
@@ -32,60 +32,93 @@
 
 
 // scope module is load statically before any route is cativated
-angular.module('TokenRefresh', ['ConfigApp', 'ModalNotification'])
+angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
 
-    .directive ('tokenRefresh', function($timeout, $http, $location, Notification, ConfigApp) {
+    .directive ('tokenRefresh', function($window, $timeout, $location, Notification, AppConfig, AppCall) {
 
     function mymethods(scope, elem, attrs) {
+        scope.logged=undefined; // neither thu neither false
         
-        scope.status=false;
-    
+        $window.onbeforeunload = function () {
+            AppCall.get ("token", "reset", {/*query*/}, function () {
+            console.log("OPA Exit Requested");                
+            });
+        };
+                 
         scope.online = function () {
             elem.addClass    ("online");
             elem.removeClass ("offline");
+            scope.logged=true;
         };
 
         scope.offline = function(){
             elem.addClass    ("offline");
             elem.removeClass ("online");
+            scope.logged=false;
+        };
+        
+        scope.onerror = function() {
+            if (scope.logged !== false)  {
+                Notification.warning ({message: "AppFramework Binder Lost", delay: 5000});
+                scope.offline();
+            }
+            scope.status = 0;
+        };
+        
+        scope.onsuccess = function(jresp) {
+            if (jresp.request.token) AppConfig.session.token = jresp.request.token;
+            if (jresp.request.uuid)  AppConfig.session.uuid  = jresp.request.uuid;
+            if (jresp.request.timeout)  AppConfig.session.timeout  = jresp.request.timeout;
+            
+            if (scope.logged !== true)  {
+                Notification.success ({message: "AppFramework Binder Back to Live", delay: 3000});
+                scope.online();
+                if (scope.callback) scope.callback(jresp);
+            }
+            scope.status = 1;
         };
 
         // Check Binder status
         scope.getping = function() {
-
-            var handler = $http.post(ConfigApp.session.ping+'?token='+ ConfigApp.session.token);
-            handler.success(function(response, errcode, headers, config) {
-                if (!scope.status)  {
-                    Notification.success ({message: "AppFramework Binder Back to Live", delay: 3000});
-                    scope.online();
-                }
-                scope.status = 1;
+            
+            AppCall.get ("token", "ping", {/*query*/},function(result) {
+                if (result.status === 200) scope.onsuccess (result.data);
+                else  scope.onerror();
+                // restart a new timer for next ping
+                $timeout (scope.getping, AppConfig.session.pingrate*1000);
             });
-
-            handler.error(function(response, errcode, headers) {
-                if (scope.status)  {
-                    Notification.warning ({message: "AppFramework Binder Lost", delay: 5000});
-                    scope.offline();
-                }
-                scope.status = 0;
-            });
-
-            // restart a new timer for next ping
-            $timeout (scope.getping, ConfigApp.session.pingrate*1000);
         };
         
         // Check Binder status
         scope.refresh = function() {
-            var handler = $http.post(ConfigApp.session.refresh+'?token='+ ConfigApp.session.token);
-            $timeout (scope.refresh, ConfigApp.session.timeout *250);
+            
+            AppCall.get ("token", "refresh", {/*query*/},function(result) {
+                if (result.status === 200) scope.onsuccess (result.data);
+                else  scope.onerror();
+                // restart a new timer for next refresh
+                $timeout (scope.refresh, AppConfig.session.timeout *250);
+            });            
+        };
+        
+        // Initial connection
+        scope.tkcreate = function() {
+            
+            AppCall.get ("token", "create", {token: AppConfig.session.initial},function(result) {
+                if (result.status === 200) scope.onsuccess (result.data);
+                else  scope.onerror();
+            });                        
         };
  
         scope.icon      = attrs.icon   || "fi-lightbulb";
         scope.hostname  = $location.host();
         scope.httpdport = $location.port();
+        scope.autolog   = JSON.parse(attrs.autolog || false);
         
-        scope.getping();
-        scope.refresh();
+        if (scope.autolog) scope.tkcreate();
+
+        // Init ping and refresh process
+        $timeout (scope.getping, AppConfig.session.pingrate*1000);
+        $timeout (scope.refresh, AppConfig.session.timeout *250);
     }
 
     return {