[Carbon-dev] svn commit r32804 - in trunk/carbon-components/identity: . org.wso2.carbon.identity.provider.openid.ui org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions org.wso2.carbon.identity.provider.openid.ui/src/main/resources org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto org.wso2.carbon.identity.provider/src/main/resources/META-INF
prabath at wso2.com
prabath at wso2.com
Sat Mar 28 22:39:57 PDT 2009
Author: prabath
Date: Sat Mar 28 22:39:56 2009
New Revision: 32804
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32804
Log:
identity
Removed:
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/ClaimAdminClient.java
Modified:
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/pom.xml
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/OpenIDUserServlet.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/OpenIDAdminClient.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDAttributeExchange.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDExtension.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDSimpleReg.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/resources/OpenIDProviderAdminService.wsdl
trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto/OpenIDUserRPDTO.java
trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/resources/META-INF/services.xml
trunk/carbon-components/identity/pom.xml
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/pom.xml?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/pom.xml (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/pom.xml Sat Mar 28 22:39:56 2009
@@ -108,7 +108,7 @@
<tasks>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/OpenIDProviderAdminService.wsdl -u -uw -o target/generated-code
- -p org.wso2.carbon.identity.openid.provider.ui -ns2p http://provider.identity.carbon.wso2.org=org.wso2.carbon.identity.openid.provider.ui,http://dto.provider.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.openid.provider.ui.dto,http://provider.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.openid.provider.ui.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.openid.provider.ui.types.axis2"/>
+ -p org.wso2.carbon.identity.provider.openid.ui -ns2p http://provider.identity.carbon.wso2.org=org.wso2.carbon.identity.provider.openid.ui,http://dto.provider.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.provider.openid.ui.dto,http://provider.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.provider.openid.ui.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.provider.openid.ui.types.axis2"/>
<classpath refid="maven.dependency.classpath"/>
<classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/>
@@ -155,7 +155,7 @@
*;resolution:=optional
</Import-Package>
<Private-Package>
- org.wso2.carbon.identity.user.registration.*,
+ org.wso2.carbon.identity.provider.*,
axis2.apache.org.xsd
</Private-Package>
<Fragment-Host>org.wso2.carbon.ui</Fragment-Host>
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/OpenIDUserServlet.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/OpenIDUserServlet.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/OpenIDUserServlet.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/OpenIDUserServlet.java Sat Mar 28 22:39:56 2009
@@ -70,7 +70,7 @@
// Keep OpenIDHandler instantiated.
OpenIDHandler.getInstance(serverUrl);
- if (!opInfo.isUserExist()) {
+ if (!opInfo.getUserExist()) {
log.info("OpenID url hit for the user who does not exist in the system" + user);
Deleted: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/ClaimAdminClient.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=32803
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/OpenIDAdminClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/OpenIDAdminClient.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/OpenIDAdminClient.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/client/OpenIDAdminClient.java Sat Mar 28 22:39:56 2009
@@ -1,8 +1,10 @@
package org.wso2.carbon.identity.provider.openid.ui.client;
+import java.util.List;
import java.util.Map;
import org.wso2.carbon.identity.base.IdentityException;
+import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDClaimDTO;
import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDProviderInfoDTO;
import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDUserRPDTO;
@@ -20,11 +22,9 @@
return null;
}
- public String getMappedOpenIDTag(String val) throws IdentityException {
- return null;
- }
- public Map<String, String> getAttributeExchangeMapping() {
+ public Map<String, OpenIDClaimDTO> getClaimValues(String userId, String profileId,
+ List<String> requredClaims) throws IdentityException {
return null;
}
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDAttributeExchange.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDAttributeExchange.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDAttributeExchange.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDAttributeExchange.java Sat Mar 28 22:39:56 2009
@@ -16,13 +16,13 @@
package org.wso2.carbon.identity.provider.openid.ui.extensions;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.openid4java.message.AuthRequest;
@@ -34,9 +34,7 @@
import org.wso2.carbon.identity.base.IdentityException;
import org.wso2.carbon.identity.base.IdentityConstants.ErrorCodes;
import org.wso2.carbon.identity.base.IdentityConstants.OpenId.ExchangeAttributes;
-import org.wso2.carbon.identity.provider.openid.ui.client.ClaimAdminClient;
-import org.wso2.carbon.identity.provider.openid.ui.client.OpenIDAdminClient;
-import org.wso2.carbon.identity.provider.openid.ui.dto.ClaimDTO;
+import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDClaimDTO;
import org.wso2.carbon.identity.provider.openid.ui.handlers.OpenIDAuthenticationRequest;
/**
@@ -64,7 +62,6 @@
* {@inheritDoc}
*/
public void addRequiredAttributes(List<String> requiredAttributes) throws IdentityException {
-
MessageExtension extensions = null;
AuthRequest authRequest = null;
@@ -85,8 +82,7 @@
fetchRequest = (FetchRequest) extensions;
- // Get the required attributes as requested by the
- // RP.
+ // Get the required attributes as requested by the RP.
required = fetchRequest.getAttributes(true);
optional = fetchRequest.getAttributes();
@@ -101,44 +97,16 @@
}
}
- Map<String, ClaimDTO> claims = null;
- ClaimDTO[] supportedClaims = null;
- ClaimAdminClient claimsAdmin = null;
- OpenIDAdminClient openIDAdmin = null;
Iterator<Entry<String, String>> iterator = null;
- Map<String, String> map = null;
Entry<String, String> entry = null;
-
- claims = new HashMap<String, ClaimDTO>();
- claimsAdmin = new ClaimAdminClient();
- supportedClaims = claimsAdmin.readAllOpenIDSupportedClaims();
-
- for (int i = 0; i < supportedClaims.length; i++) {
- ClaimDTO temp = supportedClaims[i];
- if (temp.getOpenIDTag() != null) {
- claims.put(temp.getOpenIDTag(), temp);
- }
- }
-
iterator = required.entrySet().iterator();
- map = new HashMap<String, String>();
-
- String val = null;
- String tag = null;
-
- openIDAdmin = new OpenIDAdminClient();
while (iterator.hasNext()) {
entry = iterator.next();
- val = getMappedAxSchema((String) entry.getValue());
- tag = openIDAdmin.getMappedOpenIDTag(val);
- if (tag != null && claims.get(tag) != null) {
- claims.get(tag).setClaimUri((String) entry.getValue());
- map.put(tag, (String) entry.getKey());
+ if (!requiredAttributes.contains((String) entry.getValue())) {
+ requiredAttributes.add((String) entry.getValue());
}
}
-
- mapToAttrId(map.keySet(), requiredAttributes, claims);
}
}
} catch (MessageException e) {
@@ -152,30 +120,28 @@
*/
public MessageExtension getMessageExtension(String userId, String profileName)
throws IdentityException {
-
MessageExtension extensions = null;
AuthRequest authRequest = null;
FetchResponse fetchResponse = null;
try {
authRequest = request.getAuthRequest();
- if (authRequest.hasExtension(FetchRequest.OPENID_NS_AX))
+ if (authRequest.hasExtension(FetchRequest.OPENID_NS_AX)) {
extensions = authRequest.getExtension(FetchRequest.OPENID_NS_AX);
- else if (authRequest.hasExtension(IdentityConstants.OpenId.ExchangeAttributes.NS_AX))
+ } else if (authRequest.hasExtension(IdentityConstants.OpenId.ExchangeAttributes.NS_AX)) {
extensions = authRequest
.getExtension(IdentityConstants.OpenId.ExchangeAttributes.NS_AX);
+ }
if (extensions instanceof FetchRequest) {
-
Map required = null;
Map optional = null;
FetchRequest fetchRequest = null;
- Map<String, ClaimDTO> claimValues = null;
+ Map<String, OpenIDClaimDTO> claimValues = null;
fetchRequest = (FetchRequest) extensions;
- // Get the required attributes as requested by the
- // RP.
+ // Get the required attributes as requested by the RP.
required = fetchRequest.getAttributes(true);
optional = fetchRequest.getAttributes();
@@ -189,14 +155,26 @@
}
}
}
+
+ Iterator<Entry<String, String>> iterator = null;
+ Entry<String, String> entry = null;
+ iterator = required.entrySet().iterator();
+ List<String> requiredAttributes = null;
+ requiredAttributes = new ArrayList<String>();
+
+ while (iterator.hasNext()) {
+ entry = iterator.next();
+ if (!requiredAttributes.contains((String) entry.getValue())) {
+ requiredAttributes.add((String) entry.getValue());
+ }
+ }
fetchResponse = FetchResponse.createFetchResponse(fetchRequest, new HashMap());
- claimValues = populateAttributeValues(required, userId, profileName);
+ claimValues = populateAttributeValues(requiredAttributes, userId, profileName);
setAttributeExchangeValues(fetchResponse, claimValues);
}
return fetchResponse;
-
} catch (MessageException e) {
log.error("Failed to create message extension for Attribute Exchange", e);
throw new IdentityException(IdentityConstants.ErrorCodes.OPENID_RESP_GENERATION_FAILED,
@@ -205,85 +183,6 @@
}
/**
- * {@inheritDoc}
- */
- protected Map<String, ClaimDTO> populateAttributeValues(Map<String, String> requiredClaims,
- String userId, String profileName) throws IdentityException {
-
- Map<String, ClaimDTO> claims = null;
- ClaimDTO[] supportedClaims = null;
- ClaimAdminClient claimsAdmin = null;
- OpenIDAdminClient openIDAdmin = null;
- Iterator<Entry<String, String>> iterator = null;
- Map<String, String> map = null;
- Entry<String, String> entry = null;
-
- claims = new HashMap<String, ClaimDTO>();
-
- try {
- claimsAdmin = new ClaimAdminClient();
- } catch (Exception e) {
- throw new IdentityException(e.getMessage(), e);
- }
-
- supportedClaims = claimsAdmin.readAllOpenIDSupportedClaims();
-
- for (int i = 0; i < supportedClaims.length; i++) {
- ClaimDTO temp = supportedClaims[i];
- if (temp.getOpenIDTag() != null) {
- claims.put(temp.getOpenIDTag(), temp);
- }
- }
-
- iterator = requiredClaims.entrySet().iterator();
- map = new HashMap<String, String>();
-
- String val = null;
- String tag = null;
-
- openIDAdmin = new OpenIDAdminClient();
-
- while (iterator.hasNext()) {
- entry = iterator.next();
- val = getMappedAxSchema((String) entry.getValue());
- tag = openIDAdmin.getMappedOpenIDTag(val);
- if (tag != null && claims.get(tag) != null) {
- claims.get(tag).setClaimUri((String) entry.getValue());
- map.put(tag, (String) entry.getKey());
- }
- }
-
- return populateAttributeValues(map.keySet(), userId, claims, map, profileName);
- }
-
- /**
- * This provides a mapping between http://schema.openid.net/ and http://axschema.org
- *
- * @param val schema name-space URL
- * @return mapped value
- * @throws IdentityProviderException
- */
- protected String getMappedAxSchema(String val) throws IdentityException {
-
- if (axMapping == null) {
- try {
- OpenIDAdminClient openIDClient = null;
- openIDClient = new OpenIDAdminClient();
- axMapping = openIDClient.getAttributeExchangeMapping();
- } catch (Exception e) {
- throw new IdentityException(
- IdentityConstants.ErrorCodes.OPENID_RESP_GENERATION_FAILED, e);
- }
- }
-
- if (axMapping.containsKey(val)) {
- return axMapping.get(val);
- }
-
- return val;
- }
-
- /**
* Populate the response with claim values. If we can't find the required values with us, we
* simply avoid sending them. An Identity Provider MAY return any subset of the following fields
* in response to the query.
@@ -292,17 +191,17 @@
* @throws MessageException
*/
protected void setAttributeExchangeValues(FetchResponse response,
- Map<String, ClaimDTO> claimValues) throws MessageException {
+ Map<String, OpenIDClaimDTO> claimValues) throws MessageException {
- Iterator<Entry<String, ClaimDTO>> iterator = null;
- Entry<String, ClaimDTO> entry = null;
- ClaimDTO claim = null;
+ Iterator<Entry<String, OpenIDClaimDTO>> iterator = null;
+ Entry<String, OpenIDClaimDTO> entry = null;
+ OpenIDClaimDTO claim = null;
iterator = claimValues.entrySet().iterator();
while (iterator.hasNext()) {
entry = iterator.next();
- claim = (ClaimDTO) entry.getValue();
+ claim = (OpenIDClaimDTO) entry.getValue();
response.addAttribute(claim.getOpenIDTag(), claim.getClaimUri(), claim.getClaimValue());
}
}
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDExtension.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDExtension.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDExtension.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDExtension.java Sat Mar 28 22:39:56 2009
@@ -27,8 +27,8 @@
import org.wso2.carbon.identity.base.IdentityConstants;
import org.wso2.carbon.identity.base.IdentityException;
-import org.wso2.carbon.identity.provider.openid.ui.client.ClaimAdminClient;
-import org.wso2.carbon.identity.provider.openid.ui.dto.ClaimDTO;
+import org.wso2.carbon.identity.provider.openid.ui.client.OpenIDAdminClient;
+import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDClaimDTO;
/**
* Base class for all OpenID extensions. Any OpenID extension added should extend this class.
@@ -55,34 +55,6 @@
throws IdentityException;
/**
- * Map the required attributes to their corresponding attribute id.
- *
- * @param requiredClaims A collection of required claims.
- * @param requiredAttributes A list of required attributes.
- * @param claims A map of claims.
- */
- protected void mapToAttrId(Collection<String> requiredClaims, List<String> requiredAttributes,
- Map<String, ClaimDTO> claims) {
-
- Iterator<String> iterator = null;
- // Get the column names for the URIs
- iterator = requiredClaims.iterator();
-
- String tag = null;
- ClaimDTO claim = null;
-
- // First we need to figure-out which attributes we need to retrieve from
- // the user store.
- while (iterator.hasNext()) {
- tag = (String) iterator.next();
- claim = (ClaimDTO) claims.get(tag);
- if (claim != null && !claim.getClaimUri().equals(IdentityConstants.CLAIM_PPID)) {
- requiredAttributes.add(claim.getClaimUri());
- }
- }
- }
-
- /**
* Populate the required claims with claim values.
*
* @param requiredClaims Required claims as requested by the RP.
@@ -91,35 +63,11 @@
* claims.
* @throws IdentityProviderException
*/
- protected Map<String, ClaimDTO> populateAttributeValues(Collection<String> requiredClaims,
- String userId, Map<String, ClaimDTO> claims, Map<String, String> openIDTagMapping,
- String profileName) throws IdentityException {
-
- Map<String, ClaimDTO> claimValues = null;
- Iterator<String> iterator = null;
- List<String> list = null;
- ClaimAdminClient claimAdmin = null;
+ protected Map<String, OpenIDClaimDTO> populateAttributeValues(List<String> requiredClaims,
+ String userId, String profileName) throws IdentityException {
- if (claims == null || claims.isEmpty()) {
- return null;
- }
-
- // Get the column names for the URIs
- iterator = requiredClaims.iterator();
- list = new ArrayList<String>();
-
- String tag = null;
- ClaimDTO claim = null;
-
- // First we need to figure-out which attributes we need to retrieve from
- // the user store.
- while (iterator.hasNext()) {
- tag = (String) iterator.next();
- claim = (ClaimDTO) claims.get(tag);
- if (claim != null && !claim.getClaimUri().equals(IdentityConstants.CLAIM_PPID)) {
- list.add(claim.getClaimUri());
- }
- }
+ Map<String, OpenIDClaimDTO> claimValues = null;
+ OpenIDAdminClient openIDAdmin = null;
String profile = null;
@@ -129,10 +77,8 @@
profile = profileName;
}
- claimAdmin = new ClaimAdminClient();
- claimValues = claimAdmin.getClaimValues(userId, profile, list);
-
- claimValues = new HashMap<String, ClaimDTO>();
+ openIDAdmin = new OpenIDAdminClient();
+ claimValues = openIDAdmin.getClaimValues(userId, profile, requiredClaims);
return claimValues;
}
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDSimpleReg.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDSimpleReg.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDSimpleReg.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/java/org/wso2/carbon/identity/provider/openid/ui/extensions/OpenIDSimpleReg.java Sat Mar 28 22:39:56 2009
@@ -32,8 +32,7 @@
import org.wso2.carbon.identity.base.IdentityConstants;
import org.wso2.carbon.identity.base.IdentityException;
import org.wso2.carbon.identity.base.IdentityConstants.ErrorCodes;
-import org.wso2.carbon.identity.provider.openid.ui.client.ClaimAdminClient;
-import org.wso2.carbon.identity.provider.openid.ui.dto.ClaimDTO;
+import org.wso2.carbon.identity.provider.openid.ui.dto.OpenIDClaimDTO;
import org.wso2.carbon.identity.provider.openid.ui.handlers.OpenIDAuthenticationRequest;
/**
@@ -82,7 +81,6 @@
}
if (extension instanceof SRegRequest) {
-
SRegRequest sregReq = null;
List required = null;
List optional = null;
@@ -101,20 +99,12 @@
}
}
- Map<String, ClaimDTO> claims = null;
- ClaimDTO[] supportedClaims = null;
- ClaimAdminClient claimsAdmin = null;
-
- claims = new HashMap<String, ClaimDTO>();
- claimsAdmin = new ClaimAdminClient();
- supportedClaims = claimsAdmin.readAllOpenIDSupportedClaims();
-
- for (int i = 0; i < supportedClaims.length; i++) {
- ClaimDTO temp = supportedClaims[i];
- if (temp.getOpenIDTag() != null)
- claims.put(temp.getOpenIDTag(), temp);
+ for (Iterator<String> iterator = required.iterator(); iterator.hasNext();) {
+ String claimUri = iterator.next();
+ if (!requiredAttributes.contains(claimUri)) {
+ requiredAttributes.add(claimUri);
+ }
}
- mapToAttrId(required, requiredAttributes, claims);
}
}
} catch (MessageException e) {
@@ -161,7 +151,7 @@
List required = null;
List optional = null;
Map userDataSReg = null;
- Map<String, ClaimDTO> claimValues = null;
+ Map<String, OpenIDClaimDTO> claimValues = null;
sregReq = (SRegRequest) extension;
@@ -206,11 +196,11 @@
* @throws MessageException
*/
protected void setSimpleAttributeRegistrationValues(SRegResponse response,
- Map<String, ClaimDTO> claimValues) throws MessageException {
+ Map<String, OpenIDClaimDTO> claimValues) throws MessageException {
- Iterator<Entry<String, ClaimDTO>> iterator = null;
- ClaimDTO claim = null;
- Entry<String, ClaimDTO> entry = null;
+ Iterator<Entry<String, OpenIDClaimDTO>> iterator = null;
+ OpenIDClaimDTO claim = null;
+ Entry<String, OpenIDClaimDTO> entry = null;
iterator = claimValues.entrySet().iterator();
@@ -220,32 +210,4 @@
response.addAttribute(claim.getOpenIDTag(), claim.getClaimValue());
}
}
-
- /**
- * Populate the required claims with claim values.
- *
- * @param requiredClaims Required claims as requested by the RP.
- * @param userId User ID.
- * @return A map, populated with required claim values.
- * @throws IdentityProviderException
- */
- protected Map<String, ClaimDTO> populateAttributeValues(List<String> requiredClaims,
- String userId, String profileName) throws IdentityException {
-
- Map<String, ClaimDTO> claims = null;
- ClaimDTO[] supportedClaims = null;
- ClaimAdminClient claimsAdmin = null;
-
- claims = new HashMap<String, ClaimDTO>();
- claimsAdmin = new ClaimAdminClient();
- supportedClaims = claimsAdmin.readAllOpenIDSupportedClaims();
-
- for (int i = 0; i < supportedClaims.length; i++) {
- ClaimDTO temp = supportedClaims[i];
- if (temp.getOpenIDTag() != null)
- claims.put(temp.getOpenIDTag(), temp);
- }
-
- return populateAttributeValues(requiredClaims, userId, claims, null, profileName);
- }
}
\ No newline at end of file
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/resources/OpenIDProviderAdminService.wsdl
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/resources/OpenIDProviderAdminService.wsdl?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/resources/OpenIDProviderAdminService.wsdl (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider.openid.ui/src/main/resources/OpenIDProviderAdminService.wsdl Sat Mar 28 22:39:56 2009
@@ -1,387 +1,295 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:axis2="http://registration.user.identity.carbon.wso2.org" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax218="http://dto.registration.user.identity.carbon.wso2.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://registration.user.identity.carbon.wso2.org">
- <wsdl:documentation>UserRegistrationAdminService</wsdl:documentation>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:axis2="http://provider.identity.carbon.wso2.org" xmlns:ax29="http://dto.provider.identity.carbon.wso2.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ax26="http://base.identity.carbon.wso2.org/xsd" targetNamespace="http://provider.identity.carbon.wso2.org">
+ <wsdl:documentation>OpenIDProviderService</wsdl:documentation>
<wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://dto.registration.user.identity.carbon.wso2.org/xsd">
- <xs:complexType name="UserFieldDTO">
- <xs:sequence>
- <xs:element minOccurs="0" name="defaultValue" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="fieldName" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="fieldValue" nillable="true" type="xs:string" />
- <xs:element maxOccurs="unbounded" minOccurs="0" name="inputValues" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="maxLength" type="xs:int" />
- <xs:element minOccurs="0" name="minLength" type="xs:int" />
- <xs:element minOccurs="0" name="required" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="UserDTO">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="userFields" nillable="true" type="ax218:UserFieldDTO" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="InfoCarDTO">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="attributes" nillable="true" type="ax218:UserFieldDTO" />
- <xs:element minOccurs="0" name="issuerInfo" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="ppid" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="OpenIDDTO">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="attributes" nillable="true" type="ax218:UserFieldDTO" />
- <xs:element minOccurs="0" name="issuerInfo" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="openID" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
- <xs:schema xmlns:ns="http://org.apache.axis2/xsd" xmlns:ax219="http://dto.registration.user.identity.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://org.apache.axis2/xsd">
- <xs:import namespace="http://dto.registration.user.identity.carbon.wso2.org/xsd" />
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="Exception">
+ <xs:schema xmlns:ns="http://org.apache.axis2/xsd" xmlns:ax28="http://base.identity.carbon.wso2.org/xsd" xmlns:ax210="http://dto.provider.identity.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://org.apache.axis2/xsd">
+ <xs:import namespace="http://base.identity.carbon.wso2.org/xsd" />
+ <xs:import namespace="http://dto.provider.identity.carbon.wso2.org/xsd" />
+ <xs:element name="authenticateWithOpenID">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="Exception" nillable="true" type="ns:Exception" />
+ <xs:element minOccurs="0" name="openID" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="password" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="isAddUserEnabledResponse">
+ <xs:element name="authenticateWithOpenIDResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="isAddUserWithInfoCardEnabledResponse">
+ <xs:complexType name="Exception">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType" />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="IdentityException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
+ <xs:element minOccurs="0" name="IdentityException" nillable="true" type="ax26:IdentityException" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="isAddUserWithOpenIDEnabledResponse">
+ <xs:element name="getClaimValues">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
+ <xs:element minOccurs="0" name="userId" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="profileId" nillable="true" type="xs:string" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="requredClaims" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="readUserFielsForUserRegistrationResponse">
+ <xs:element name="getClaimValuesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax218:UserFieldDTO" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax210:OpenIDClaimDTO" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addUser">
+ <xs:element name="getOpenIDProviderInfo">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="user" nillable="true" type="ax218:UserDTO" />
+ <xs:element minOccurs="0" name="userName" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addUserWithInfoCard">
+ <xs:element name="getOpenIDProviderInfoResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="infoCard" nillable="true" type="ax218:InfoCarDTO" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax210:OpenIDProviderInfoDTO" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addUserWithOpenID">
+ <xs:element name="getOpenIDUserRP">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="openID" nillable="true" type="ax218:OpenIDDTO" />
+ <xs:element minOccurs="0" name="userName" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="rpUrl" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="getOpenIDUserRPResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax210:OpenIDUserRPDTO" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
+ <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://dto.provider.identity.carbon.wso2.org/xsd">
+ <xs:complexType name="OpenIDClaimDTO">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="claimUri" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="claimValue" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="displayTag" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="enabled" type="xs:boolean" />
+ <xs:element minOccurs="0" name="openIDTag" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="OpenIDProviderInfoDTO">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="openID" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="openIDProviderServerUrl" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="userExist" type="xs:boolean" />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="OpenIDUserRPDTO">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="defaultProfileName" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+ <xs:schema xmlns:ax27="http://org.apache.axis2/xsd" attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://base.identity.carbon.wso2.org/xsd">
+ <xs:import namespace="http://org.apache.axis2/xsd" />
+ <xs:complexType name="IdentityException">
+ <xs:complexContent>
+ <xs:extension base="ax27:Exception">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
- <wsdl:message name="addUserWithOpenIDRequest">
- <wsdl:part name="parameters" element="ns1:addUserWithOpenID" />
+ <wsdl:message name="getClaimValuesRequest">
+ <wsdl:part name="parameters" element="ns1:getClaimValues" />
+ </wsdl:message>
+ <wsdl:message name="getClaimValuesResponse">
+ <wsdl:part name="parameters" element="ns1:getClaimValuesResponse" />
</wsdl:message>
- <wsdl:message name="Exception">
- <wsdl:part name="parameters" element="ns1:Exception" />
+ <wsdl:message name="IdentityException">
+ <wsdl:part name="parameters" element="ns1:IdentityException" />
</wsdl:message>
- <wsdl:message name="readUserFielsForUserRegistrationRequest" />
- <wsdl:message name="readUserFielsForUserRegistrationResponse">
- <wsdl:part name="parameters" element="ns1:readUserFielsForUserRegistrationResponse" />
+ <wsdl:message name="getOpenIDUserRPRequest">
+ <wsdl:part name="parameters" element="ns1:getOpenIDUserRP" />
</wsdl:message>
- <wsdl:message name="isAddUserWithInfoCardEnabledRequest" />
- <wsdl:message name="isAddUserWithInfoCardEnabledResponse">
- <wsdl:part name="parameters" element="ns1:isAddUserWithInfoCardEnabledResponse" />
+ <wsdl:message name="getOpenIDUserRPResponse">
+ <wsdl:part name="parameters" element="ns1:getOpenIDUserRPResponse" />
</wsdl:message>
- <wsdl:message name="isAddUserWithOpenIDEnabledRequest" />
- <wsdl:message name="isAddUserWithOpenIDEnabledResponse">
- <wsdl:part name="parameters" element="ns1:isAddUserWithOpenIDEnabledResponse" />
+ <wsdl:message name="getOpenIDProviderInfoRequest">
+ <wsdl:part name="parameters" element="ns1:getOpenIDProviderInfo" />
</wsdl:message>
- <wsdl:message name="addUserWithInfoCardRequest">
- <wsdl:part name="parameters" element="ns1:addUserWithInfoCard" />
+ <wsdl:message name="getOpenIDProviderInfoResponse">
+ <wsdl:part name="parameters" element="ns1:getOpenIDProviderInfoResponse" />
</wsdl:message>
- <wsdl:message name="addUserRequest">
- <wsdl:part name="parameters" element="ns1:addUser" />
+ <wsdl:message name="authenticateWithOpenIDRequest">
+ <wsdl:part name="parameters" element="ns1:authenticateWithOpenID" />
</wsdl:message>
- <wsdl:message name="isAddUserEnabledRequest" />
- <wsdl:message name="isAddUserEnabledResponse">
- <wsdl:part name="parameters" element="ns1:isAddUserEnabledResponse" />
+ <wsdl:message name="authenticateWithOpenIDResponse">
+ <wsdl:part name="parameters" element="ns1:authenticateWithOpenIDResponse" />
</wsdl:message>
- <wsdl:portType name="UserRegistrationAdminServicePortType">
- <wsdl:operation name="addUserWithOpenID">
- <wsdl:input message="axis2:addUserWithOpenIDRequest" wsaw:Action="urn:addUserWithOpenID" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:addUserWithOpenIDException" />
- </wsdl:operation>
- <wsdl:operation name="readUserFielsForUserRegistration">
- <wsdl:input message="axis2:readUserFielsForUserRegistrationRequest" wsaw:Action="urn:readUserFielsForUserRegistration" />
- <wsdl:output message="axis2:readUserFielsForUserRegistrationResponse" wsaw:Action="urn:readUserFielsForUserRegistrationResponse" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:readUserFielsForUserRegistrationException" />
- </wsdl:operation>
- <wsdl:operation name="isAddUserWithInfoCardEnabled">
- <wsdl:input message="axis2:isAddUserWithInfoCardEnabledRequest" wsaw:Action="urn:isAddUserWithInfoCardEnabled" />
- <wsdl:output message="axis2:isAddUserWithInfoCardEnabledResponse" wsaw:Action="urn:isAddUserWithInfoCardEnabledResponse" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:isAddUserWithInfoCardEnabledException" />
- </wsdl:operation>
- <wsdl:operation name="isAddUserWithOpenIDEnabled">
- <wsdl:input message="axis2:isAddUserWithOpenIDEnabledRequest" wsaw:Action="urn:isAddUserWithOpenIDEnabled" />
- <wsdl:output message="axis2:isAddUserWithOpenIDEnabledResponse" wsaw:Action="urn:isAddUserWithOpenIDEnabledResponse" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:isAddUserWithOpenIDEnabledException" />
- </wsdl:operation>
- <wsdl:operation name="addUserWithInfoCard">
- <wsdl:input message="axis2:addUserWithInfoCardRequest" wsaw:Action="urn:addUserWithInfoCard" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:addUserWithInfoCardException" />
- </wsdl:operation>
- <wsdl:operation name="addUser">
- <wsdl:input message="axis2:addUserRequest" wsaw:Action="urn:addUser" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:addUserException" />
- </wsdl:operation>
- <wsdl:operation name="isAddUserEnabled">
- <wsdl:input message="axis2:isAddUserEnabledRequest" wsaw:Action="urn:isAddUserEnabled" />
- <wsdl:output message="axis2:isAddUserEnabledResponse" wsaw:Action="urn:isAddUserEnabledResponse" />
- <wsdl:fault message="axis2:Exception" name="Exception" wsaw:Action="urn:isAddUserEnabledException" />
+ <wsdl:portType name="OpenIDProviderServicePortType">
+ <wsdl:operation name="getClaimValues">
+ <wsdl:input message="axis2:getClaimValuesRequest" wsaw:Action="urn:getClaimValues" />
+ <wsdl:output message="axis2:getClaimValuesResponse" wsaw:Action="urn:getClaimValuesResponse" />
+ <wsdl:fault message="axis2:IdentityException" name="IdentityException" wsaw:Action="urn:getClaimValuesIdentityException" />
+ </wsdl:operation>
+ <wsdl:operation name="getOpenIDUserRP">
+ <wsdl:input message="axis2:getOpenIDUserRPRequest" wsaw:Action="urn:getOpenIDUserRP" />
+ <wsdl:output message="axis2:getOpenIDUserRPResponse" wsaw:Action="urn:getOpenIDUserRPResponse" />
+ </wsdl:operation>
+ <wsdl:operation name="getOpenIDProviderInfo">
+ <wsdl:input message="axis2:getOpenIDProviderInfoRequest" wsaw:Action="urn:getOpenIDProviderInfo" />
+ <wsdl:output message="axis2:getOpenIDProviderInfoResponse" wsaw:Action="urn:getOpenIDProviderInfoResponse" />
+ </wsdl:operation>
+ <wsdl:operation name="authenticateWithOpenID">
+ <wsdl:input message="axis2:authenticateWithOpenIDRequest" wsaw:Action="urn:authenticateWithOpenID" />
+ <wsdl:output message="axis2:authenticateWithOpenIDResponse" wsaw:Action="urn:authenticateWithOpenIDResponse" />
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="UserRegistrationAdminServiceSoap11Binding" type="axis2:UserRegistrationAdminServicePortType">
+ <wsdl:binding name="OpenIDProviderServiceSoap11Binding" type="axis2:OpenIDProviderServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="addUserWithOpenID">
- <soap:operation soapAction="urn:addUserWithOpenID" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isAddUserWithInfoCardEnabled">
- <soap:operation soapAction="urn:isAddUserWithInfoCardEnabled" style="document" />
+ <wsdl:operation name="getClaimValues">
+ <soap:operation soapAction="urn:getClaimValues" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
+ <wsdl:fault name="IdentityException">
+ <soap:fault use="literal" name="IdentityException" />
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="readUserFielsForUserRegistration">
- <soap:operation soapAction="urn:readUserFielsForUserRegistration" style="document" />
+ <wsdl:operation name="getOpenIDUserRP">
+ <soap:operation soapAction="urn:getOpenIDUserRP" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="isAddUserWithOpenIDEnabled">
- <soap:operation soapAction="urn:isAddUserWithOpenIDEnabled" style="document" />
+ <wsdl:operation name="getOpenIDProviderInfo">
+ <soap:operation soapAction="urn:getOpenIDProviderInfo" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="addUserWithInfoCard">
- <soap:operation soapAction="urn:addUserWithInfoCard" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="addUser">
- <soap:operation soapAction="urn:addUser" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isAddUserEnabled">
- <soap:operation soapAction="urn:isAddUserEnabled" style="document" />
+ <wsdl:operation name="authenticateWithOpenID">
+ <soap:operation soapAction="urn:authenticateWithOpenID" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
</wsdl:binding>
- <wsdl:binding name="UserRegistrationAdminServiceSoap12Binding" type="axis2:UserRegistrationAdminServicePortType">
+ <wsdl:binding name="OpenIDProviderServiceSoap12Binding" type="axis2:OpenIDProviderServicePortType">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="addUserWithOpenID">
- <soap12:operation soapAction="urn:addUserWithOpenID" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isAddUserWithInfoCardEnabled">
- <soap12:operation soapAction="urn:isAddUserWithInfoCardEnabled" style="document" />
+ <wsdl:operation name="getClaimValues">
+ <soap12:operation soapAction="urn:getClaimValues" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap12:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
+ <wsdl:fault name="IdentityException">
+ <soap12:fault use="literal" name="IdentityException" />
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="readUserFielsForUserRegistration">
- <soap12:operation soapAction="urn:readUserFielsForUserRegistration" style="document" />
+ <wsdl:operation name="getOpenIDUserRP">
+ <soap12:operation soapAction="urn:getOpenIDUserRP" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap12:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="isAddUserWithOpenIDEnabled">
- <soap12:operation soapAction="urn:isAddUserWithOpenIDEnabled" style="document" />
+ <wsdl:operation name="getOpenIDProviderInfo">
+ <soap12:operation soapAction="urn:getOpenIDProviderInfo" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap12:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="addUserWithInfoCard">
- <soap12:operation soapAction="urn:addUserWithInfoCard" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="addUser">
- <soap12:operation soapAction="urn:addUser" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="isAddUserEnabled">
- <soap12:operation soapAction="urn:isAddUserEnabled" style="document" />
+ <wsdl:operation name="authenticateWithOpenID">
+ <soap12:operation soapAction="urn:authenticateWithOpenID" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap12:body use="literal" />
</wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception" />
- </wsdl:fault>
</wsdl:operation>
</wsdl:binding>
- <wsdl:binding name="UserRegistrationAdminServiceHttpBinding" type="axis2:UserRegistrationAdminServicePortType">
+ <wsdl:binding name="OpenIDProviderServiceHttpBinding" type="axis2:OpenIDProviderServicePortType">
<http:binding verb="POST" />
- <wsdl:operation name="addUserWithOpenID">
- <http:operation location="UserRegistrationAdminService/addUserWithOpenID" />
- <wsdl:input>
- <mime:content type="text/xml" part="addUserWithOpenID" />
- </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="isAddUserWithInfoCardEnabled">
- <http:operation location="UserRegistrationAdminService/isAddUserWithInfoCardEnabled" />
+ <wsdl:operation name="getClaimValues">
+ <http:operation location="OpenIDProviderService/getClaimValues" />
<wsdl:input>
- <mime:content type="text/xml" part="isAddUserWithInfoCardEnabled" />
+ <mime:content type="text/xml" part="getClaimValues" />
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="isAddUserWithInfoCardEnabled" />
+ <mime:content type="text/xml" part="getClaimValues" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="readUserFielsForUserRegistration">
- <http:operation location="UserRegistrationAdminService/readUserFielsForUserRegistration" />
+ <wsdl:operation name="getOpenIDUserRP">
+ <http:operation location="OpenIDProviderService/getOpenIDUserRP" />
<wsdl:input>
- <mime:content type="text/xml" part="readUserFielsForUserRegistration" />
+ <mime:content type="text/xml" part="getOpenIDUserRP" />
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="readUserFielsForUserRegistration" />
+ <mime:content type="text/xml" part="getOpenIDUserRP" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="isAddUserWithOpenIDEnabled">
- <http:operation location="UserRegistrationAdminService/isAddUserWithOpenIDEnabled" />
+ <wsdl:operation name="getOpenIDProviderInfo">
+ <http:operation location="OpenIDProviderService/getOpenIDProviderInfo" />
<wsdl:input>
- <mime:content type="text/xml" part="isAddUserWithOpenIDEnabled" />
+ <mime:content type="text/xml" part="getOpenIDProviderInfo" />
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="isAddUserWithOpenIDEnabled" />
+ <mime:content type="text/xml" part="getOpenIDProviderInfo" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="addUserWithInfoCard">
- <http:operation location="UserRegistrationAdminService/addUserWithInfoCard" />
- <wsdl:input>
- <mime:content type="text/xml" part="addUserWithInfoCard" />
- </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="addUser">
- <http:operation location="UserRegistrationAdminService/addUser" />
- <wsdl:input>
- <mime:content type="text/xml" part="addUser" />
- </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="isAddUserEnabled">
- <http:operation location="UserRegistrationAdminService/isAddUserEnabled" />
+ <wsdl:operation name="authenticateWithOpenID">
+ <http:operation location="OpenIDProviderService/authenticateWithOpenID" />
<wsdl:input>
- <mime:content type="text/xml" part="isAddUserEnabled" />
+ <mime:content type="text/xml" part="authenticateWithOpenID" />
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="isAddUserEnabled" />
+ <mime:content type="text/xml" part="authenticateWithOpenID" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="UserRegistrationAdminService">
- <wsdl:port name="UserRegistrationAdminServiceHttpsSoap11Endpoint" binding="axis2:UserRegistrationAdminServiceSoap11Binding">
- <soap:address location="https://prabath:8243/services/UserRegistrationAdminService.UserRegistrationAdminServiceHttpsSoap11Endpoint" />
+ <wsdl:service name="OpenIDProviderService">
+ <wsdl:port name="OpenIDProviderServiceHttpsSoap11Endpoint" binding="axis2:OpenIDProviderServiceSoap11Binding">
+ <soap:address location="https://192.168.1.2:9443/services/OpenIDProviderService.OpenIDProviderServiceHttpsSoap11Endpoint" />
</wsdl:port>
- <wsdl:port name="UserRegistrationAdminServiceHttpsSoap12Endpoint" binding="axis2:UserRegistrationAdminServiceSoap12Binding">
- <soap12:address location="https://prabath:8243/services/UserRegistrationAdminService.UserRegistrationAdminServiceHttpsSoap12Endpoint" />
+ <wsdl:port name="OpenIDProviderServiceHttpsSoap12Endpoint" binding="axis2:OpenIDProviderServiceSoap12Binding">
+ <soap12:address location="https://192.168.1.2:9443/services/OpenIDProviderService.OpenIDProviderServiceHttpsSoap12Endpoint" />
</wsdl:port>
- <wsdl:port name="UserRegistrationAdminServiceHttpsEndpoint" binding="axis2:UserRegistrationAdminServiceHttpBinding">
- <http:address location="https://prabath:8243/services/UserRegistrationAdminService.UserRegistrationAdminServiceHttpsEndpoint" />
+ <wsdl:port name="OpenIDProviderServiceHttpsEndpoint" binding="axis2:OpenIDProviderServiceHttpBinding">
+ <http:address location="https://192.168.1.2:9443/services/OpenIDProviderService.OpenIDProviderServiceHttpsEndpoint" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto/OpenIDUserRPDTO.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto/OpenIDUserRPDTO.java?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto/OpenIDUserRPDTO.java (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/java/org/wso2/carbon/identity/provider/dto/OpenIDUserRPDTO.java Sat Mar 28 22:39:56 2009
@@ -2,4 +2,13 @@
public class OpenIDUserRPDTO {
+ private String defaultProfileName;
+
+ public String getDefaultProfileName() {
+ return defaultProfileName;
+ }
+
+ public void setDefaultProfileName(String defaultProfileName) {
+ this.defaultProfileName = defaultProfileName;
+ }
}
Modified: trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/resources/META-INF/services.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/resources/META-INF/services.xml?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/resources/META-INF/services.xml (original)
+++ trunk/carbon-components/identity/org.wso2.carbon.identity.provider/src/main/resources/META-INF/services.xml Sat Mar 28 22:39:56 2009
@@ -9,8 +9,21 @@
To administer Identity Provider related functionality.
</description>
<parameter name="ServiceClass">org.wso2.carbon.identity.provider.InforCardAdminService</parameter>
+ <parameter name="AuthorizationAction" locked="true">manage-configuration</parameter>
</service>
+ <service name="OpenIDProviderService" scope="transportsession">
+ <transports>
+ <transport>https</transport>
+ </transports>
+ <schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
+ <description>
+ To administer Identity Provider related functionality.
+ </description>
+ <parameter name="ServiceClass">org.wso2.carbon.identity.provider.OpenIDProviderService</parameter>
+ <parameter name="DoAuthentication" locked="true">false</parameter>
+ </service>
+
<service name="RelyingPartyAdminService" scope="transportsession">
<transports>
<transport>https</transport>
@@ -20,8 +33,9 @@
To administer trusted relying party related functionality.
</description>
<parameter name="ServiceClass">org.wso2.carbon.identity.provider.RelyingPartyAdminService</parameter>
- </service>
-
- <parameter name="AuthorizationAction" locked="true">manage-configuration</parameter>
+ <parameter name="AuthorizationAction" locked="true">manage-configuration</parameter>
+ </service>
+
<parameter name="adminService" locked="true">true</parameter>
+
</serviceGroup>
\ No newline at end of file
Modified: trunk/carbon-components/identity/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/identity/pom.xml?rev=32804&r1=32803&r2=32804&view=diff
==============================================================================
--- trunk/carbon-components/identity/pom.xml (original)
+++ trunk/carbon-components/identity/pom.xml Sat Mar 28 22:39:56 2009
@@ -24,6 +24,7 @@
<module>org.wso2.carbon.identity.core</module>
<module>org.wso2.carbon.identity.provider</module>
<module>org.wso2.carbon.identity.provider.ui</module>
+ <module>org.wso2.carbon.identity.provider.openid.ui</module>
<module>org.wso2.carbon.identity.sts</module>
<module>org.wso2.carbon.identity.sts.mgt</module>
<module>org.wso2.carbon.identity.sts.mgt.ui</module>
More information about the Carbon-dev
mailing list