Author: anil.saldhana(a)jboss.com Date: 2009-07-09 14:24:50 -0400 (Thu, 09 Jul 2009) New Revision: 635 Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/LocalProviderOpenIDUnitTestCase.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/YadisMetadataUnitTestCase.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java Log: JBID-131: openid Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/LocalProviderOpenIDUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/LocalProviderOpenIDUnitTestCase.java 2009-07-08 20:40:44 UTC (rev 634) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/LocalProviderOpenIDUnitTestCase.java 2009-07-09 18:24:50 UTC (rev 635) @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; -import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -31,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.identity.federation.api.openid.OpenIDManager; +import org.jboss.identity.federation.api.openid.OpenIDProviderList; import org.jboss.identity.federation.api.openid.OpenIDRequest; import org.jboss.test.identity.federation.bindings.server.EmbeddedWebServerBase; import org.mortbay.jetty.servlet.Context; @@ -69,7 +69,7 @@ InMemoryProtocolAdapter ad = new InMemoryProtocolAdapter(); OpenIDRequest openIDRequest = new OpenIDRequest(username); OpenIDManager idm = new OpenIDManager(openIDRequest); - List<?> providers = idm.discoverProviders(); + OpenIDProviderList providers = idm.discoverProviders(); assertNotNull("List of providers is not null", providers); idm.authenticate(ad, providers); Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/YadisMetadataUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/YadisMetadataUnitTestCase.java 2009-07-08 20:40:44 UTC (rev 634) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/openid/YadisMetadataUnitTestCase.java 2009-07-09 18:24:50 UTC (rev 635) @@ -22,7 +22,6 @@ package org.jboss.test.identity.federation.bindings.openid; import java.io.IOException; -import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -30,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.identity.federation.api.openid.OpenIDManager; +import org.jboss.identity.federation.api.openid.OpenIDProviderList; import org.jboss.identity.federation.api.openid.OpenIDRequest; import org.jboss.identity.federation.bindings.servlets.OpenIDYadisServlet; import org.jboss.test.identity.federation.bindings.server.EmbeddedWebServerBase; @@ -63,9 +63,9 @@ OpenIDRequest openIDRequest = new OpenIDRequest(username); OpenIDManager idm = new OpenIDManager(openIDRequest); - List<?> providers = idm.discoverProviders(); + OpenIDProviderList providers = idm.discoverProviders(); assertNotNull("Providers list is not null", providers); - assertEquals("1 provider", 1, providers.size()); + assertEquals("1 provider", 1, providers.get().size()); } /** Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-07-08 20:40:44 UTC (rev 634) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-07-09 18:24:50 UTC (rev 635) @@ -67,10 +67,11 @@ } } - public List<?> discoverProviders() throws OpenIDDiscoveryException, OpenIDConsumerException + @SuppressWarnings("unchecked") + public OpenIDProviderList discoverProviders() throws OpenIDDiscoveryException, OpenIDConsumerException { // perform discovery on the user-supplied identifier - List<?> discoveries; + List<DiscoveryInformation> discoveries; try { discoveries = consumerManager.discover(userString); @@ -80,15 +81,16 @@ throw new OpenIDDiscoveryException(e1); } - return discoveries; + return new OpenIDProviderList(discoveries); } @SuppressWarnings("unchecked") - public boolean authenticate(OpenIDProtocolAdapter adapter, List<?> discoveries) + public boolean authenticate(OpenIDProtocolAdapter adapter, OpenIDProviderList listOfProviders) throws OpenIDDiscoveryException, OpenIDConsumerException, OpenIDMessageException, OpenIDProtocolException { - + List<DiscoveryInformation> discoveries = listOfProviders.get(); + if(discoveries.size() == 0) throw new OpenIDConsumerException("No open id endpoints discovered");