From 15342df5861b486f9e17bc7a9e8d71d24ba3cf91 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 31 Jul 2017 15:02:42 +0000
Subject: [PATCH] SSDM-5398 : New property to know the authentication service
used
SVN: 38589
---
.../openbis/generic/server/asapi/v3/ApplicationServerApi.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
index 735e9db79cf..768a344c9a5 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
@@ -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.openbis.common.spring.IInvocationLoggerContext;
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.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
@@ -837,7 +838,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
GetSessionInformationOperationResult result = executeOperation(sessionToken, new GetSessionInformationOperation());
return result.getSessionInformation();
}
-
+
@Override
@Transactional(readOnly = true)
public boolean isSessionActive(String sessionToken)
@@ -915,6 +916,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
info.put("project-samples-enabled", Boolean.toString(isProjectSamplesEnabled(null)));
info.put("archiving-configured", Boolean.toString(isArchivingConfigured(null)));
info.put("enabled-technologies", configurer.getResolvedProps().getProperty(Constants.ENABLED_MODULES_KEY));
+ info.put("authentication-service", configurer.getResolvedProps().getProperty(ComponentNames.AUTHENTICATION_SERVICE));
// String disabledText = tryGetDisabledText();
// if (disabledText != null)
// {
--
GitLab