Skip to content
Snippets Groups Projects
Commit 15342df5 authored by juanf's avatar juanf
Browse files

SSDM-5398 : New property to know the authentication service used

SVN: 38589
parent 4950417b
No related branches found
No related tags found
No related merge requests found
...@@ -269,6 +269,7 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.IExecuteOp ...@@ -269,6 +269,7 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.IExecuteOp
import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin; import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
...@@ -837,7 +838,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi> ...@@ -837,7 +838,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
GetSessionInformationOperationResult result = executeOperation(sessionToken, new GetSessionInformationOperation()); GetSessionInformationOperationResult result = executeOperation(sessionToken, new GetSessionInformationOperation());
return result.getSessionInformation(); return result.getSessionInformation();
} }
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public boolean isSessionActive(String sessionToken) public boolean isSessionActive(String sessionToken)
...@@ -915,6 +916,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi> ...@@ -915,6 +916,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
info.put("project-samples-enabled", Boolean.toString(isProjectSamplesEnabled(null))); info.put("project-samples-enabled", Boolean.toString(isProjectSamplesEnabled(null)));
info.put("archiving-configured", Boolean.toString(isArchivingConfigured(null))); info.put("archiving-configured", Boolean.toString(isArchivingConfigured(null)));
info.put("enabled-technologies", configurer.getResolvedProps().getProperty(Constants.ENABLED_MODULES_KEY)); info.put("enabled-technologies", configurer.getResolvedProps().getProperty(Constants.ENABLED_MODULES_KEY));
info.put("authentication-service", configurer.getResolvedProps().getProperty(ComponentNames.AUTHENTICATION_SERVICE));
// String disabledText = tryGetDisabledText(); // String disabledText = tryGetDisabledText();
// if (disabledText != null) // if (disabledText != null)
// { // {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment