From 6909d0251be423492041cd4368d7765565737df5 Mon Sep 17 00:00:00 2001
From: vkovtun <vkovtun@ethz.ch>
Date: Thu, 28 Sep 2023 15:09:43 +0200
Subject: [PATCH] BIS-774: Rewriting callbacks to promises. Fixed the issue
with not working login page.
---
.../src/js/api/server-data-store-facade.js | 7 +++++--
.../src/js/demo/server-data-store-login.js | 11 ++++++-----
.../resources/server-data-store-config.properties | 4 ++--
.../src/test/resources/test-server-config.properties | 2 +-
.../resources/test-server-with-auth-config.properties | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/api-data-store-server-javascript/src/js/api/server-data-store-facade.js b/api-data-store-server-javascript/src/js/api/server-data-store-facade.js
index 5eedbb4f65f..52be1744c59 100644
--- a/api-data-store-server-javascript/src/js/api/server-data-store-facade.js
+++ b/api-data-store-server-javascript/src/js/api/server-data-store-facade.js
@@ -309,8 +309,11 @@ DataStoreServer.prototype.login = function(userId, userPassword) {
this._internal.datastoreUrl,
encodeParams(data)
).then((loginResponse) => {
- datastoreObj._internal.sessionToken = loginResponse;
- datastoreObj.rememberSession();
+ return new Promise((resolve, reject) => {
+ datastoreObj._internal.sessionToken = loginResponse;
+ datastoreObj.rememberSession();
+ resolve(loginResponse);
+ })
});
}
diff --git a/api-data-store-server-javascript/src/js/demo/server-data-store-login.js b/api-data-store-server-javascript/src/js/demo/server-data-store-login.js
index 6e954f7bafe..148bd45512e 100644
--- a/api-data-store-server-javascript/src/js/demo/server-data-store-login.js
+++ b/api-data-store-server-javascript/src/js/demo/server-data-store-login.js
@@ -62,11 +62,12 @@ dssClientLoginPage.prototype.configure = function(){
document.getElementById("login-form").onsubmit = function() {
loginPage.datastore.login(document.getElementById("username").value.trim(),
- document.getElementById("password").value.trim()).then((data) => {
- document.getElementById("username").value = '';
- document.getElementById("password").value = '';
- loginPage.onLogin(data);
- })
+ document.getElementById("password").value.trim())
+ .then((data) => {
+ document.getElementById("username").value = '';
+ document.getElementById("password").value = '';
+ loginPage.onLogin(data);
+ })
};
loginPage.datastore.ifRestoredSessionActive().then((data) => loginPage.onLogin(data));
diff --git a/server-data-store/src/main/resources/server-data-store-config.properties b/server-data-store/src/main/resources/server-data-store-config.properties
index 850f4ccd20b..cf70d73c76e 100755
--- a/server-data-store/src/main/resources/server-data-store-config.properties
+++ b/server-data-store/src/main/resources/server-data-store-config.properties
@@ -8,11 +8,11 @@ writeAheadLogRoot=./target/tests/transactions
storageRoot=./target/tests/storage
httpServerClass=ch.ethz.sis.afsserver.http.impl.NettyHttpServer
-httpServerUri=/fileserver
+httpServerUri=/data-store-server
httpServerPort=8085
httpMaxContentLength=1024
-maxReadSizeInBytes=1024
+maxReadSizeInBytes=1048576
authenticationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthenticationInfoProvider
authorizationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthorizationInfoProvider
poolSize=50
diff --git a/server-data-store/src/test/resources/test-server-config.properties b/server-data-store/src/test/resources/test-server-config.properties
index 430d16f423d..ae2c6d30812 100644
--- a/server-data-store/src/test/resources/test-server-config.properties
+++ b/server-data-store/src/test/resources/test-server-config.properties
@@ -29,7 +29,7 @@ httpServerPort=8085
httpServerUri=/fileserver
httpMaxContentLength=1024
-maxReadSizeInBytes=1024
+maxReadSizeInBytes=1048576
authenticationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthenticationInfoProvider
authorizationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthorizationInfoProvider
poolSize=50
diff --git a/server-data-store/src/test/resources/test-server-with-auth-config.properties b/server-data-store/src/test/resources/test-server-with-auth-config.properties
index cd2e462ccfc..1ee88621d70 100644
--- a/server-data-store/src/test/resources/test-server-with-auth-config.properties
+++ b/server-data-store/src/test/resources/test-server-with-auth-config.properties
@@ -29,7 +29,7 @@ httpServerPort=8085
httpServerUri=/fileserver
httpMaxContentLength=1024
-maxReadSizeInBytes=1024
+maxReadSizeInBytes=1048576
authenticationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.OpenBISAuthenticationInfoProvider
authorizationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.OpenBISAuthorizationInfoProvider
poolSize=50
--
GitLab