SSDM-2495 : Polishing

SVN: 34744

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js

@@ -146,13 +146,7 @@ function MainController(profile) {
 							});
 						}
 						
-						if(username && password) {
-							localReference.serverFacade.initServices(username, password, nextInit);
-						} else {
-							nextInit();
-						}
-						
-
+						nextInit();
 				});
 			}
 		);

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

@@ -69,18 +69,6 @@ function ServerFacade(openbisServer) {
 		this.openbisServer.logout(callbackFunction);
 	}
 	
-	this.initServices = function(username, password, callbackFunction) {
-		var defaultDataSetCode = profile.getDefaultDataStoreCode();
-		this.createReportFromAggregationService(defaultDataSetCode, {
-			"method" : "initServices",
-			"username" : username,
-			"password" : password,
-			"openBISURL" : this.openbisServer._internal.openbisUrl
-		}, function(result) {
-			callbackFunction();
-		});
-	}
-	
 	//
 	// User Related Functions
 	//

plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py

@@ -38,7 +38,6 @@ from net.lingala.zip4j.core import ZipFile
 from ch.systemsx.cisd.common.exceptions import UserFailureException
 
 from ch.ethz.ssdm.eln import PlasmapperConnector
-from ch.ethz.ssdm.eln import ELNStore
 import time
 import subprocess
 import os.path
@@ -79,8 +78,6 @@ def process(tr, parameters, tableBuilder):
 	
 	if method == "init":
 		isOk = init(tr, parameters, tableBuilder);
-	if method == "initServices":
-		isOk = initServices(tr, parameters, tableBuilder);
 	if method == "searchSamples":
 		result = searchSamples(tr, parameters, tableBuilder, sessionId);
 		isOk = True;
@@ -493,16 +490,9 @@ def insertUpdateExperiment(tr, parameters, tableBuilder):
 	
 	return True;
 
-def initServices(tr, parameters, tableBuilder):
-	ELNStore.put(parameters.get("username"), parameters.get("password"));
-	return True
-
 def searchSamples(tr, parameters, tableBuilder, sessionId):
-	username = sessionId;
-	password = ELNStore.get(username);
 	openBISURL = parameters.get("openBISURL");
 	v3 = HttpInvokerUtils.createServiceStub(IApplicationServerApi, openBISURL + IApplicationServerApi.SERVICE_URL, 30 * 1000);
-	sessionToken = v3.login(username, password);
 	
 	###############
 	############### V3 Search
@@ -611,9 +601,7 @@ def searchSamples(tr, parameters, tableBuilder, sessionId):
 	###############
 	###############
 	###############
-	
-	result = v3.searchSamples(sessionToken, criterion, fetchOptions);
-	v3.logout(sessionToken);
+	result = v3.searchSamples(parameters.get("sessionToken"), criterion, fetchOptions);
 	
 	###
 	### Json Conversion