From 392d6640ff6e536230c3d441eea3a720d5fb0545 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 21 Jan 2015 10:34:58 +0000
Subject: [PATCH] SSDM-1340 : Disable Login via a nologin file
SVN: 33292
---
.../generic/client/web/server/AbstractClientService.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index 00f7ac0f2a2..746de99e87d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -69,7 +69,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailure
import ch.systemsx.cisd.openbis.generic.client.web.server.util.TableModelUtils;
import ch.systemsx.cisd.openbis.generic.client.web.server.util.XMLPropertyTransformer;
import ch.systemsx.cisd.openbis.generic.server.SessionConstants;
-import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationBean;
import ch.systemsx.cisd.openbis.generic.shared.Constants;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.WebClientConfigurationProvider;
@@ -583,12 +582,8 @@ public abstract class AbstractClientService implements IClientService,
{
try
{
- if(AuthorizationBean.getInstance().isASDisabled()) {
- return null;
- } else {
- final SessionContextDTO session = getServer().tryAuthenticate(userID, password);
- return tryToLogin(session);
- }
+ final SessionContextDTO session = getServer().tryAuthenticate(userID, password);
+ return tryToLogin(session);
} catch (final IllegalStateException e)
{
operationLog.error("Session already invalidated.", e);
--
GitLab