Created hybrid issuer service, addresses #509

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridIssuerService.java

@@ -0,0 +1,75 @@
+package org.mitre.openid.connect.client.service.impl;
+
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.mitre.openid.connect.client.model.IssuerServiceResponse;
+import org.mitre.openid.connect.client.service.IssuerService;
+
+import com.google.common.collect.Sets;
+
+/**
+ * 
+ * Issuer service that tries to parse input from the inputs from a third-party
+ * account chooser service (if possible), but falls back to webfinger discovery
+ * if not. 
+ * 
+ * @author jricher
+ *
+ */
+public class HybridIssuerService implements IssuerService {
+
+	private ThirdPartyIssuerService thirdPartyIssuerService = new ThirdPartyIssuerService();
+	private WebfingerIssuerService webfingerIssuerService = new WebfingerIssuerService();
+	
+	@Override
+	public IssuerServiceResponse getIssuer(HttpServletRequest request) {
+		
+		IssuerServiceResponse resp = thirdPartyIssuerService.getIssuer(request);
+		if (resp.shouldRedirect()) {
+			// if it wants us to redirect, try the webfinger approach first
+			return webfingerIssuerService.getIssuer(request);
+		} else {
+			return resp;
+		}
+		
+	}
+	
+	public Set<String> getWhitelist() {
+		return Sets.union(thirdPartyIssuerService.getWhitelist(), webfingerIssuerService.getWhitelist());
+	}
+
+	public void setWhitelist(Set<String> whitelist) {
+		thirdPartyIssuerService.setWhitelist(whitelist);
+		webfingerIssuerService.setWhitelist(whitelist);
+	}
+
+	public Set<String> getBlacklist() {
+		return Sets.union(thirdPartyIssuerService.getBlacklist(), webfingerIssuerService.getWhitelist());
+	}
+
+	public void setBlacklist(Set<String> blacklist) {
+		thirdPartyIssuerService.setBlacklist(blacklist);
+		webfingerIssuerService.setBlacklist(blacklist);
+	}
+
+	public String getParameterName() {
+		return webfingerIssuerService.getParameterName();
+	}
+
+	public void setParameterName(String parameterName) {
+		webfingerIssuerService.setParameterName(parameterName);
+	}
+
+	public String getLoginPageUrl() {
+		return webfingerIssuerService.getLoginPageUrl();
+	}
+
+	public void setLoginPageUrl(String loginPageUrl) {
+		webfingerIssuerService.setLoginPageUrl(loginPageUrl);
+		thirdPartyIssuerService.setAccountChooserUrl(loginPageUrl); // set the same URL on both, but this one gets ignored
+	}
+
+
+}