From 07bbb1900acc411da012291f6c0530230a1110e0 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Wed, 23 Dec 2015 00:54:27 +0100 Subject: [PATCH] Added Autolog to TokenRefresh Widget --- afb-client/app/Frontend/etc/ConfigApp.js | 7 ++- afb-client/app/Frontend/pages/Home/Home.html | 2 +- afb-client/app/Frontend/pages/Home/HomeModule.js | 8 +-- .../widgets/Notifications/TokenRefreshSvc.js | 63 +++++++++++++++------- 4 files changed, 55 insertions(+), 25 deletions(-) diff --git a/afb-client/app/Frontend/etc/ConfigApp.js b/afb-client/app/Frontend/etc/ConfigApp.js index 22cf220..27e2e3e 100644 --- a/afb-client/app/Frontend/etc/ConfigApp.js +++ b/afb-client/app/Frontend/etc/ConfigApp.js @@ -17,12 +17,15 @@ appli : 'images/appli/' }, - api: { // Warning paths should end with / - token : '/api/token/' + myapi: { // Warning paths should end with / + token : '/api/myplugin/xxxx' }, session: { // Those data are updated by session service + create : '/api/token/create', refresh : '/api/token/refresh', + check : '/api/token/check', + reset : '/api/token/reset', ping : '/api/token/check', initial : '123456789', // typical dev initial token timeout : 3600, // timeout is updated client sessin context creation diff --git a/afb-client/app/Frontend/pages/Home/Home.html b/afb-client/app/Frontend/pages/Home/Home.html index 307bd2d..d3c6719 100644 --- a/afb-client/app/Frontend/pages/Home/Home.html +++ b/afb-client/app/Frontend/pages/Home/Home.html @@ -11,7 +11,7 @@ animationIn: slideInRight App Framework Binder Simple Client - +
diff --git a/afb-client/app/Frontend/pages/Home/HomeModule.js b/afb-client/app/Frontend/pages/Home/HomeModule.js index 6ebaefc..6a73bdf 100644 --- a/afb-client/app/Frontend/pages/Home/HomeModule.js +++ b/afb-client/app/Frontend/pages/Home/HomeModule.js @@ -56,7 +56,7 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh']) scope.OpenSession = function() { console.log ("OpenSession"); var postdata= {/* any json your application may need */}; - var handler = $http.post(ConfigApp.api.token + 'create?token='+ConfigApp.session.initial, postdata); + var handler = $http.post(ConfigApp.session.create + '?token='+ConfigApp.session.initial, postdata); handler.success(scope.ProcessResponse); handler.error(scope.ProcessError); @@ -65,7 +65,7 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh']) scope.CheckSession = function() { console.log ("CloseSession"); var postdata= {/* any json your application may need */}; - var handler = $http.post(ConfigApp.api.token + 'check?token='+scope.token, postdata); + var handler = $http.post(ConfigApp.session.check + '?token='+ConfigApp.session.token, postdata); handler.success(scope.ProcessResponse); handler.error(scope.ProcessError); @@ -74,7 +74,7 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh']) scope.RefreshSession = function() { console.log ("RefreshSession"); var postdata= {/* any json your application may need */}; - var handler = $http.post(ConfigApp.api.token + 'refresh?token='+scope.token, postdata); + var handler = $http.post(ConfigApp.session.refresh + '?token='+ConfigApp.session.token, postdata); handler.success(scope.ProcessResponse); handler.error(scope.ProcessError); @@ -83,7 +83,7 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh']) scope.ResetSession = function() { console.log ("ResetSession"); var postdata= {/* any json your application may need */}; - var handler = $http.post(ConfigApp.api.token + 'reset?token='+scope.token, postdata); + var handler = $http.post(ConfigApp.session.reset + '?token='+ConfigApp.session.token, postdata); handler.success(scope.ProcessResponse); handler.error(scope.ProcessError); diff --git a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js index 0d1cf38..834aaff 100644 --- a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js +++ b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js @@ -37,8 +37,8 @@ angular.module('TokenRefresh', ['ConfigApp', 'ModalNotification']) .directive ('tokenRefresh', function($timeout, $http, $location, Notification, ConfigApp) { function mymethods(scope, elem, attrs) { + scope.status=undefined; // neither thu neither false - scope.status=false; scope.online = function () { elem.addClass ("online"); @@ -49,26 +49,35 @@ angular.module('TokenRefresh', ['ConfigApp', 'ModalNotification']) elem.addClass ("offline"); elem.removeClass ("online"); }; + + scope.onerror = function(data, errcode, headers) { + if (scope.status !== false) { + Notification.warning ({message: "AppFramework Binder Lost", delay: 5000}); + scope.offline(); + } + scope.status = 0; + }; + + scope.onsuccess = function(data, errcode, headers, config) { + if (scope.status !== true) { + if (data.request.token) ConfigApp.session.token = data.request.token; + if (data.request.uuid) ConfigApp.session.uuid = data.request.uuid; + if (data.request.timeout) ConfigApp.session.timeout = data.request.timeout; + + Notification.success ({message: "AppFramework Binder Back to Live", delay: 3000}); + scope.online(); + } + 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; - }); - - handler.error(function(response, errcode, headers) { - if (scope.status) { - Notification.warning ({message: "AppFramework Binder Lost", delay: 5000}); - scope.offline(); - } - scope.status = 0; - }); + + // process success and error + handler.success(scope.onsuccess); + handler.error(scope.onerror); // restart a new timer for next ping $timeout (scope.getping, ConfigApp.session.pingrate*1000); @@ -77,15 +86,33 @@ angular.module('TokenRefresh', ['ConfigApp', 'ModalNotification']) // Check Binder status scope.refresh = function() { var handler = $http.post(ConfigApp.session.refresh+'?token='+ ConfigApp.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, ConfigApp.session.timeout *250); }; + + // Initial connection + scope.tkcreate = function() { + var handler = $http.post(ConfigApp.session.create+'?token='+ ConfigApp.session.initial); + + // process success and error + handler.success(scope.onsuccess); + handler.error(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, ConfigApp.session.pingrate*1000); + $timeout (scope.refresh, ConfigApp.session.timeout *250); } return { -- 2.16.6