X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fframework%2Futils%2Futils.js;h=93f8d7d838eb42d10dad07058b2e70c64bf07745;hb=04997f0db765e39bd3a1fa76d40043eda9cdd326;hp=16037d7407f5751b8a2bdf7f38e1ae009d0eed00;hpb=119e39d96483d5cec756be95cc0cb735fb6f9a74;p=osm%2FUI.git diff --git a/skyquake/framework/utils/utils.js b/skyquake/framework/utils/utils.js index 16037d740..93f8d7d83 100644 --- a/skyquake/framework/utils/utils.js +++ b/skyquake/framework/utils/utils.js @@ -18,9 +18,9 @@ //Login needs to be refactored. Too many cross dependencies var AuthActions = require('../widgets/login/loginAuthActions.js'); var $ = require('jquery'); -var rw = require('utils/rw.js'); +import rw from './rw.js'; var API_SERVER = rw.getSearchParams(window.location).api_server; -let NODE_PORT = require('utils/rw.js').getSearchParams(window.location).api_port || ((window.location.protocol == 'https:') ? 8443 : 8000); +let NODE_PORT = rw.getSearchParams(window.location).api_port || ((window.location.protocol == 'https:') ? 8443 : 8000); var SockJS = require('sockjs-client'); var Utils = {}; @@ -185,26 +185,7 @@ Utils.getPacketDataWithUnitPrefix = function(number, precision) { } } Utils.loginHash = "#/login"; -Utils.setAuthentication = function(username, password, cb) { - var self = this; - var AuthBase64 = btoa(username + ":" + password); - window.sessionStorage.setItem("auth", AuthBase64); - self.detectInactivity(); - $.ajax({ - url: '//' + window.location.hostname + ':' + window.location.port + '/check-auth?api_server=' + API_SERVER, - type: 'GET', - beforeSend: Utils.addAuthorizationStub, - success: function(data) { - //console.log("LoggingSource.getLoggingConfig success call. data=", data); - if (cb) { - cb(); - }; - }, - error: function(data) { - Utils.clearAuthentication(); - } - }); -} + Utils.clearAuthentication = function(callback) { var self = this; window.sessionStorage.removeItem("auth");