Author: prabath
Date: Tue Apr 1 03:15:40 2008
New Revision: 15443
Log:
added default token type
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
Tue Apr 1 03:15:40 2008
@@ -296,8 +296,11 @@
}
- private void readRequestedTokenType(RahasData data){
+ private void readRequestedTokenType(RahasData data) {
requiredTokenType = data.getTokenType();
+ if (requiredTokenType == null || requiredTokenType.trim().length() ==
0) {
+ requiredTokenType = getDefautTokenType();
+ }
}
/**
@@ -633,10 +636,21 @@
}
public void setRequiredTokenType(String requiredTokenType) {
+ if (requiredTokenType == null || requiredTokenType.trim().length() ==
0) {
+ requiredTokenType = getDefautTokenType();
+ }
this.requiredTokenType = requiredTokenType;
}
-
-
+ /**
+ * This parameter specifies the type of the token to be requested from the
+ * STS as a URI. This parameter can be omitted if the STS and the Web site
+ * front-end have a mutual understanding about what token type will be
+ * provided, or if the Web site is willing to accept any token type.
+ * @return Default Token Type
+ */
+ protected String getDefautTokenType() {
+ return IdentityConstants.SAML10_URL;
+ }
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
Tue Apr 1 03:15:40 2008
@@ -256,7 +256,13 @@
tok.setCard(card);
tok.setDateExpires(notAfter.toDate());
tok.setDateIssued(notBefore.toDate());
- tok.setTokenType(rahasData.getTokenType());
+
+ if (rahasData.getTokenType() == null
+ || rahasData.getTokenType().trim().length() == 0) {
+ tok.setTokenType(ipData.getDefautTokenType());
+ } else {
+ tok.setTokenType(rahasData.getTokenType());
+ }
dbman.create(tok);
return env;
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
