From 7f48c9764f74adb39d4454130ad87f698991389c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 20 Jun 2017 09:20:50 +0200
Subject: [PATCH] fix on bug preventing login
---
frontend-js/src/main/js/ServerConnector.js | 1 +
frontend-js/src/test/js/ServerConnector-mock.js | 2 +-
.../apiCalls/doLogin/{POST_token=MOCK_TOKEN_ID& => POST_} | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename frontend-js/testFiles/apiCalls/doLogin/{POST_token=MOCK_TOKEN_ID& => POST_} (100%)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 25c0655847..04a02317e1 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -861,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());
diff --git a/frontend-js/src/test/js/ServerConnector-mock.js b/frontend-js/src/test/js/ServerConnector-mock.js
index 03cbb59db4..8e62b9ed36 100644
--- a/frontend-js/src/test/js/ServerConnector-mock.js
+++ b/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 +="/";
}
diff --git a/frontend-js/testFiles/apiCalls/doLogin/POST_token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/doLogin/POST_
similarity index 100%
rename from frontend-js/testFiles/apiCalls/doLogin/POST_token=MOCK_TOKEN_ID&
rename to frontend-js/testFiles/apiCalls/doLogin/POST_
--
GitLab