diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2016-02-09 18:46:34 +0100 |
|---|---|---|
| committer | Fulup Ar Foll <fulup@iot.bzh> | 2016-02-09 18:46:34 +0100 |
| commit | 0b8932c5e5fa8499d37099701df9ddd5c3907e41 (patch) | |
| tree | e1a9db0b34afc98d9e41b172ef8e22e8fd9359d0 | |
| parent | eaefa5edd0356936fbe07d27f726444a4f156446 (diff) | |
Implemented URL query parsing for initial token /opa/?token=abcde
| -rw-r--r-- | afm-client/app/Frontend/app.js | 10 | ||||
| -rw-r--r-- | afm-client/app/Frontend/etc/AppConfig.js | 4 | ||||
| -rw-r--r-- | afm-client/dist.prod/sessions/AFB-probe.json | 1 | ||||
| -rw-r--r-- | afm-client/dist.prod/sessions/AFB-process.pid | 1 |
4 files changed, 12 insertions, 4 deletions
diff --git a/afm-client/app/Frontend/app.js b/afm-client/app/Frontend/app.js index 1d8fc2e..74f5d5f 100644 --- a/afm-client/app/Frontend/app.js +++ b/afm-client/app/Frontend/app.js @@ -1,5 +1,12 @@ (function() { 'use strict'; + function ParseQueryString () { + var qd = {}; + location.search.substr(1).split("&").forEach(function(item) { + var k = item.split("=")[0], v = decodeURIComponent(item.split("=")[1]); (k in qd) ? qd[k].push(v) : qd[k] = [v]; + }); + return qd; + } angular.module('@@APPNAME@@', [ // Warning: Appname should fit with gulpfile.js & index.html 'ui.router', @@ -23,14 +30,13 @@ 'RangeSlider', 'ModalNotification' ]) + .value ('urlquery', ParseQueryString()) .config(config) .run(run) ; config.$inject = ['$urlRouterProvider', '$locationProvider']; - console.log ("***location=" + window.location + " search" + window.search); - function config($urlProvider, $locationProvider, AppConfig) { $urlProvider.otherwise('/dashboard'); diff --git a/afm-client/app/Frontend/etc/AppConfig.js b/afm-client/app/Frontend/etc/AppConfig.js index 16c05b5..076cd91 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); @@ -29,7 +29,7 @@ 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 uuid : '', // uuid map with cookie or long term session access key diff --git a/afm-client/dist.prod/sessions/AFB-probe.json b/afm-client/dist.prod/sessions/AFB-probe.json new file mode 100644 index 0000000..ff8b7ad --- /dev/null +++ b/afm-client/dist.prod/sessions/AFB-probe.json @@ -0,0 +1 @@ +{"checked":11342}
\ No newline at end of file diff --git a/afm-client/dist.prod/sessions/AFB-process.pid b/afm-client/dist.prod/sessions/AFB-process.pid new file mode 100644 index 0000000..fc768ef --- /dev/null +++ b/afm-client/dist.prod/sessions/AFB-process.pid @@ -0,0 +1 @@ +11359 |