Author: prabath
Date: Fri Jan 25 09:25:12 2008
New Revision: 12924
Log:
added error codes
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/openid/relyingparty/OpenIDConsumer.java
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/openid/relyingparty/OpenIDConsumer.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/openid/relyingparty/OpenIDConsumer.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/openid/relyingparty/OpenIDConsumer.java
Fri Jan 25 09:25:12 2008
@@ -47,7 +47,8 @@
manager = new ConsumerManager();
} catch (ConsumerException e) {
// Present error to the user
- throw new RelyingPartyException(e.getMessage(), e);
+ throw new RelyingPartyException(
+ IdentityConstants.ErrorCodes.RP_INITIATION_FAILED, e);
}
manager.setAssociations(new InMemoryConsumerAssociationStore());
manager.setNonceVerifier(new InMemoryNonceVerifier(5000));
@@ -128,7 +129,8 @@
} catch (OpenIDException e) {
// Present error to the user
- throw new RelyingPartyException(e.getMessage(), e);
+ throw new RelyingPartyException(
+ IdentityConstants.ErrorCodes.INVALID_OPENID, e);
}
return null;
@@ -170,7 +172,8 @@
discovered);
if (verification.getVerifiedId() == null)
- throw new RelyingPartyException("OpenID verification failed");
+ throw new RelyingPartyException(
+
IdentityConstants.ErrorCodes.OPENID_VERIFICATION_FAILED);
authSuccess = (AuthSuccess) verification.getAuthResponse();
@@ -200,7 +203,9 @@
} catch (OpenIDException e) {
// Present error to the user.
- throw new RelyingPartyException(e.getMessage(), e);
+ throw new RelyingPartyException(
+ IdentityConstants.ErrorCodes.OPENID_AUTHENTICATION_FAILED,
+ e);
}
}
@@ -212,7 +217,8 @@
throws RelyingPartyException {
if (request == null)
- throw new RelyingPartyException("Null request");
+ throw new RelyingPartyException(
+
IdentityConstants.ErrorCodes.INVALID_OPENID_AUTHENTICATION_REQUEST);
if (request.getReturnUrl() == null)
request.setReturnUrl((String) request.getRequest().getParameter(
@@ -246,7 +252,8 @@
throw new RelyingPartyException(e.getMessage(), e);
}
} else {
- throw new RelyingPartyException("xmlToken not set");
+ throw new RelyingPartyException(
+ IdentityConstants.ErrorCodes.INVALID_XMLTOKEN);
}
request.setAttribute(TokenVerifierConstants.SERVLET_ATTR_STATE,
@@ -289,9 +296,10 @@
response = new ParameterList(map);
- if (response.hasParameter("openid.mode")) {
+ if (response.hasParameter(IdentityConstants.OpenId.ATTR_MODE)) {
String mode = null;
- mode = response.getParameterValue("openid.mode");
+ mode = response
+ .getParameterValue(IdentityConstants.OpenId.ATTR_MODE);
if (IdentityConstants.OpenId.OPENOD_RESPONSE.equals(mode)) {
return true;
@@ -343,7 +351,8 @@
verified = verification.getVerifiedId();
if (verified == null)
- throw new RelyingPartyException("OpenID verification failed");
+ throw new RelyingPartyException(
+ IdentityConstants.ErrorCodes.OPENID_VERIFICATION_FAILED);
Message authResponse = verification.getAuthResponse();
@@ -399,7 +408,9 @@
token = OpenIDToken.createFromXmlToken(xmlToken);
} catch (InfocardException e) {
// Present error to the user.
- throw new RelyingPartyException(e.getMessage(), e);
+ throw new RelyingPartyException(
+
IdentityConstants.ErrorCodes.OPENID_TOKEN_EXTRACTION_FAILED,
+ e);
}
return token.getOpenIDParams();
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
