X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=afm-client%2Fapp%2FFrontend%2Fetc%2FAppConfig.js;h=be5a107080e297269586935421cf1f89cf178fd9;hb=d47fd84a6a16b1c9c4b4ce5a3279b9ecaea54c1b;hp=16c05b536e8b425d7a403b0db2ab13e7af59afe4;hpb=712446796a33a47ea7e5fafd7950141ac8060530;p=src%2Fapp-framework-demo.git diff --git a/afm-client/app/Frontend/etc/AppConfig.js b/afm-client/app/Frontend/etc/AppConfig.js index 16c05b5..be5a107 100644 --- a/afm-client/app/Frontend/etc/AppConfig.js +++ b/afm-client/app/Frontend/etc/AppConfig.js @@ -5,7 +5,7 @@ angular.module('AppConfig', []) // Factory is a singleton and share its context within all instances. - .factory('AppConfig', function () { + .factory('AppConfig', function (urlquery) { // console.log ("URL="+ $location.url() + " Query=" + location.href+ " window=" + document.referrer); @@ -13,25 +13,16 @@ paths: { // Warning paths should end with / image : 'images/', - icons : 'images/icons/', + icons : '/icons/', avatar: 'images/avatars/', audio : 'images/audio/', appli : 'images/appli/' }, - - 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 + initial : urlquery.token || '123456789', // typical dev initial token timeout : 3600, // timeout is updated client sessin context creation - pingrate: 60, // Ping rate to check if server is still alive + pingrate: 15, // Ping rate to check if server is still alive uuid : '', // uuid map with cookie or long term session access key token : '' // will be returned from authentication } @@ -41,10 +32,10 @@ }) // Factory is a singleton and share its context within all instances. - .factory('AppCall', function ($http, AppConfig) { + .factory('AppCall', function ($http, AppConfig, $log) { var myCalls = { get : function(plugin, action, query, callback) { - query.token = AppConfig.session.token; // add token to provided query + if (!query.token) query.token = AppConfig.session.token; // add token to provided query $http.get('/api/' + plugin + '/' + action , {params: query}).then (callback, callback); } @@ -53,4 +44,4 @@ }); -})(); \ No newline at end of file +})();