[picketlink-commits] Picketlink SVN: r913 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth.

[picketlink-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-04-25 22:00:06 -0400 (Mon, 25 Apr 2011)
New Revision: 913

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/STSIssuingLoginModule.java
Log:
fall back on base class

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/STSIssuingLoginModule.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/STSIssuingLoginModule.java	2011-04-25 11:14:14 UTC (rev 912)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/STSIssuingLoginModule.java	2011-04-26 02:00:06 UTC (rev 913)
@@ -59,30 +59,34 @@
  */
 public class STSIssuingLoginModule extends AbstractSTSLoginModule
 {
-    public static final String ENDPOINT_OPTION = "endpointURI";
-    public static final String TOKEN_TYPE_OPTION = "tokenType";
+   public static final String ENDPOINT_OPTION = "endpointURI";
 
-    private String endpointURI;
-    private String tokenType;
+   public static final String TOKEN_TYPE_OPTION = "tokenType";
 
-    @Override
-    public void initialize(final Subject subject, final CallbackHandler callbackHandler, final Map<String, ?> sharedState, final Map<String, ?> options)
-    {
-        super.initialize(subject, callbackHandler, sharedState, options);
-        
-        endpointURI = (String) options.get(ENDPOINT_OPTION);
-        tokenType = (String) options.get(TOKEN_TYPE_OPTION);
-    }
+   private String endpointURI;
 
-    /**
-     * This method will issue a token for the configured user. 
-     * 
-     * @return Element The issued element.
-     * @throws LoginException If an error occurs while trying to perform the authentication.
-     */
-    public Element invokeSTS(final STSClient stsClient) throws WSTrustException
-    {
-        return stsClient.issueToken(endpointURI, tokenType);
-    }
-    
-}
+   private String tokenType;
+
+   @Override
+   public void initialize(final Subject subject, final CallbackHandler callbackHandler,
+         final Map<String, ?> sharedState, final Map<String, ?> options)
+   {
+      super.initialize(subject, callbackHandler, sharedState, options);
+
+      endpointURI = (String) options.get(ENDPOINT_OPTION);
+      if (endpointURI == null)
+         endpointURI = (String) options.get(ENDPOINT_ADDRESS); //base class
+      tokenType = (String) options.get(TOKEN_TYPE_OPTION);
+   }
+
+   /**
+    * This method will issue a token for the configured user. 
+    * 
+    * @return Element The issued element.
+    * @throws LoginException If an error occurs while trying to perform the authentication.
+    */
+   public Element invokeSTS(final STSClient stsClient) throws WSTrustException
+   {
+      return stsClient.issueToken(endpointURI, tokenType);
+   }
+}
\ No newline at end of file