Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: rpc.js: make base URL configurable

Browse source 
Implement setters and getters for the base URL prefix used and also
implement a session ID getter while we're at it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-04-05 08:08:17 +02:00
parent eee323cb66
commit 90288b2e2c
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/luci-base/htdocs/luci-static/resources/rpc.js
View file

@ -3,7 +3,8 @@
var rpcRequestRegistry = {}, var rpcRequestRegistry = {},
rpcRequestBatch = null, rpcRequestBatch = null,
rpcRequestID = 1, rpcRequestID = 1,
rpcSessionID = L.env.sessionid || '00000000000000000000000000000000'; rpcSessionID = L.env.sessionid || '00000000000000000000000000000000',
rpcBaseURL = L.url('admin/ubus');
return L.Class.extend({ return L.Class.extend({
call: function(req, cbFn) { call: function(req, cbFn) {
@ -25,7 +26,7 @@ return L.Class.extend({
q += '/%s.%s'.format(req.params[1], req.params[2]); q += '/%s.%s'.format(req.params[1], req.params[2]);
} }
return L.Request.post(L.url('admin/ubus') + q, req, { return L.Request.post(rpcBaseURL + q, req, {
timeout: (L.env.rpctimeout || 5) * 1000, timeout: (L.env.rpctimeout || 5) * 1000,
credentials: true credentials: true
}).then(cb); }).then(cb);
@ -190,7 +191,19 @@ return L.Class.extend({
}, this, this, options); }, this, this, options);
}, },
getSessionID: function() {
return rpcSessionID;
},
setSessionID: function(sid) { setSessionID: function(sid) {
rpcSessionID = sid; rpcSessionID = sid;
},
getBaseURL: function() {
return rpcBaseURL;
},
setBaseURL: function(url) {
rpcBaseURL = url;
} }
}); });