Merge branch '93-session-expire' into 'master'

Session expire bug fix

Closes #93

See merge request !29

frontend-js/src/main/js/ServerConnector.js

@@ -117,6 +117,7 @@ ServerConnector._readFile = function(url) {
 };
 
 ServerConnector.sendPostRequest = function(url, params) {
+  var self = this; 
   if (self.getSessionData().getToken() === undefined) {
     self.getSessionData().setLogin(undefined);
     window.location.reload(false);
@@ -140,6 +141,7 @@ ServerConnector.sendPostRequest = function(url, params) {
 };
 
 ServerConnector.sendPutRequest = function(url, params) {
+  var self = this; 
   if (self.getSessionData().getToken() === undefined) {
     self.getSessionData().setLogin(undefined);
     window.location.reload(false);
@@ -162,6 +164,7 @@ ServerConnector.sendPutRequest = function(url, params) {
 };
 
 ServerConnector.sendDeleteRequest = function(url, params) {
+  var self = this; 
   if (self.getSessionData().getToken() === undefined) {
     self.getSessionData().setLogin(undefined);
     window.location.reload(false);
@@ -185,6 +188,7 @@ ServerConnector.sendDeleteRequest = function(url, params) {
 };
 
 ServerConnector.sendPatchRequest = function(url, params) {
+  var self = this; 
   if (self.getSessionData().getToken() === undefined) {
     self.getSessionData().setLogin(undefined);
     window.location.reload(false);
@@ -857,6 +861,7 @@ ServerConnector.login = function(login, password) {
   } else {
     params.login = "anonymous";
   }
+  self.getSessionData().setToken("");
   return self.sendPostRequest(self.loginUrl(), params).then(function() {
     self.getSessionData().setLogin(params.login);
     return Promise.resolve(self.getSessionData().getToken());

frontend-js/src/test/js/ServerConnector-mock.js

@@ -29,7 +29,7 @@ function replaceAsterisk(str) {
 function urlToFileName(url) {
   var result = url;
   var token = OriginalServerConnector.getSessionData().getToken();
-  if (token!==undefined && url.startsWith("./testFiles/apiCalls")) {
+  if (token!==undefined && token!=="" && url.startsWith("./testFiles/apiCalls")) {
     if (!result.endsWith("&") &&!result.endsWith("_") ) {
       result +="/";
     }