From fa4ed7ea0664117242b5b792a710df9dd64e7fa0 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Wed, 24 Feb 2016 13:08:40 -0500
Subject: [PATCH] "dual-client" mode is mutually exclusive with HEART mode,
HEART mode takes precedence
---
.../connect/config/ConfigurationPropertiesBean.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
index ce444812e..3af68e3a9 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
@@ -201,7 +201,11 @@ public class ConfigurationPropertiesBean {
* @return true if dual client is configured, otherwise false
*/
public boolean isDualClient() {
- return dualClient;
+ if (isHeartMode()) {
+ return false; // HEART mode is incompatible with dual client mode
+ } else {
+ return dualClient;
+ }
}
/**
@@ -212,7 +216,7 @@ public class ConfigurationPropertiesBean {
}
/**
- * Get the list of namespaces as a JSON string
+ * Get the list of namespaces as a JSON string, for injection into the JavaScript UI
* @return
*/
public String getLanguageNamespacesString() {