BIS-774: Rewriting callbacks to promises. Fixed the issue with not working login page.

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);
+		})
 	});
 }
 

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));

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

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

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