Code Review
/
src
/
app-framework-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated TokenRefresh and AppConfig
[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
16c05b5
..
1963203
100644
(file)
--- 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.
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);
// console.log ("URL="+ $location.url() + " Query=" + location.href+ " window=" + document.referrer);
@@
-13,25
+13,16
@@
paths: { // Warning paths should end with /
image : 'images/',
paths: { // Warning paths should end with /
image : 'images/',
- icons : '
images
/icons/',
+ icons : '/icons/',
avatar: 'images/avatars/',
audio : 'images/audio/',
appli : 'images/appli/'
},
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
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
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
}
uuid : '', // uuid map with cookie or long term session access key
token : '' // will be returned from authentication
}
@@
-44,7
+35,7
@@
.factory('AppCall', function ($http, AppConfig) {
var myCalls = {
get : function(plugin, action, query, callback) {
.factory('AppCall', function ($http, AppConfig) {
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);
}
$http.get('/api/' + plugin + '/' + action , {params: query}).then (callback, callback);
}
@@
-53,4
+44,4
@@
});
});
-})();
\ No newline at end of file
+})();