From 45a0273b1d253c3cdf6405fc6716661a079f9f72 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 31 May 2017 17:17:45 +0200
Subject: [PATCH] promise chain fixed
---
frontend-js/src/main/js/ServerConnector.js | 30 ++++++++++------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 3458d7ee8a..7bc783e5f7 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1029,24 +1029,22 @@ ServerConnector.getClosestElementsByCoordinates = function(params) {
ServerConnector.login = function(login, password) {
var self = this;
- return new Promise(function(resolve, reject) {
- var params = {};
- if (login !== undefined) {
- params.login = login;
- params.password = password;
+ var params = {};
+ if (login !== undefined) {
+ params.login = login;
+ params.password = password;
+ } else {
+ params.login = "anonymous";
+ }
+ return self.sendPostRequest(self.loginUrl(), params).then(function(content) {
+ var obj = JSON.parse(content);
+ var token = obj.id;
+ if (token === undefined) {
+ return Promise.reject(obj.error);
} else {
- params.login = "anonymous";
+ self.getSessionData().setToken(token);
+ return Promise.resolve(token);
}
- return self.sendPostRequest(self.loginUrl(), params).then(function(content) {
- var obj = JSON.parse(content);
- var token = obj.id;
- if (token === undefined) {
- reject(obj.error);
- } else {
- self.getSessionData().setToken(token);
- resolve(token);
- }
- });
});
};
--
GitLab