Clean up to prepare new version of API

[src/app-framework-demo.git] / afm-client / app / Frontend / etc / AppConfig.js

diff --git a/afm-client/app/Frontend/etc/AppConfig.js b/afm-client/app/Frontend/etc/AppConfig.js
index 076cd91..d24a626 100644 (file)
--- a/afm-client/app/Frontend/etc/AppConfig.js
+++ b/afm-client/app/Frontend/etc/AppConfig.js
@@ -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 : 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    
                     }
@@ -40,17 +31,40 @@
                 return myConfig;
             })
 
-            // Factory is a singleton and share its context within all instances.
-            .factory('AppCall', function ($http, AppConfig) {
+           // Factory is a singleton and share its context within all instances.
+            .factory('AppCall', function ($http, AppConfig, $log) {
+                
                 var myCalls = {
-                    get : function(plugin, action, query, callback) {
-                        query.token = AppConfig.session.token; // add token to provided query                        
-                        $http.get('/api/' + plugin + '/' + action , {params: query}).then (callback, callback);
+                    get : function(plugin, action, query, cbresponse, cberror) {                                                
+                        
+                        var onerror = function(response) {
+                            if (cberror) cberror(response.data, response.status, response.config);
+                            else cbresponse(response.data, response.status, response.config);
+                        };
+                        
+                        var onsuccess =function(response) {
+                            if (!response.data || !response.data.request) {
+                                onerror (response);
+                                return;
+                            }                            
+                        
+                            var request=response.data.request;
+                            
+                            // if token was updated keep it within application cache
+                            if (request.token) AppConfig.session.token = request.token;
+                            if (request.uuid)  AppConfig.session.uuid  = request.uuid;
+                            if (request.timeout) AppConfig.session.timeout = request.timeout;
+                        
+                            cbresponse(response.data, response.status, response.config);
+                        };
+                        
+                        
+                        if (!query.token) query.token = AppConfig.session.token; // add token to provided query
+                        if (!query.reqid) query.reqid = action; // use action as default requestID
+                        var handle= $http.get('/api/' + plugin + '/' + action , {params: query}).then(onsuccess, onerror);
+                        
                     }
-
                 };
                 return myCalls;
             });
-    
- 
-})();
\ No newline at end of file
+})();