aboutsummaryrefslogtreecommitdiff
path: root/web/app/controller/Root.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-19 10:23:32 +1300
committerGitHub <noreply@github.com>2016-11-19 10:23:32 +1300
commit28b7d1fc6dbfe14dc0b675143137f90198bac947 (patch)
tree575aa630f31711facc6009de4f7f8b0b00031c96 /web/app/controller/Root.js
parenta252dbe43512c75afd4a17075b834f767576fd28 (diff)
parentbe60c87c9b5333e847c85d109484c431d5651562 (diff)
downloadtrackermap-web-28b7d1fc6dbfe14dc0b675143137f90198bac947.tar.gz
trackermap-web-28b7d1fc6dbfe14dc0b675143137f90198bac947.tar.bz2
trackermap-web-28b7d1fc6dbfe14dc0b675143137f90198bac947.zip
Merge pull request #323 from Abyss777/token2
Implement users tokens
Diffstat (limited to 'web/app/controller/Root.js')
-rw-r--r--web/app/controller/Root.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 568b761d..e30446c9 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -34,11 +34,18 @@ Ext.define('Traccar.controller.Root', {
},
onServerReturn: function (options, success, response) {
+ var token, parameters = {};
if (success) {
Traccar.app.setServer(Ext.decode(response.responseText));
+ token = Ext.Object.fromQueryString(window.location.search).token;
+ if (token) {
+ parameters.token = token;
+ }
Ext.Ajax.request({
scope: this,
url: 'api/session',
+ method: 'GET',
+ params: parameters,
callback: this.onSessionReturn
});
} else {