You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/04/24 02:52:02 UTC
svn commit: r937568 - in /shindig/trunk/java/common/src: main/java/org/apache/shindig/auth/ test/java/org/apache/shindig/common/testing/

Author: lindner
Date: Sat Apr 24 00:52:02 2010
New Revision: 937568

URL: http://svn.apache.org/viewvc?rev=937568&view=rev
Log:
Add encoding to SecurityTokenDecoder, turning it into a codec

Modified:
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java?rev=937568&r1=937567&r2=937568&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java Sat Apr 24 00:52:02 2010
@@ -117,4 +117,18 @@ public class BlobCrypterSecurityTokenDec
       throw new SecurityTokenException(e);
     }
   }
+
+  public String encodeToken(SecurityToken token) throws SecurityTokenException {
+    if (! (token instanceof BlobCrypterSecurityToken)) {
+      throw new SecurityTokenException("Can only encode BlogCrypterSecurityTokens");
+    }
+
+    BlobCrypterSecurityToken t = (BlobCrypterSecurityToken)token;
+
+    try {
+      return t.encrypt();
+    } catch (BlobCrypterException e) {
+      throw new SecurityTokenException(e);
+    }
+  }
 }

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java?rev=937568&r1=937567&r2=937568&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java Sat Apr 24 00:52:02 2010
@@ -66,4 +66,7 @@ public class DefaultSecurityTokenDecoder
     return decoder.createToken(tokenParameters);
   }
 
+  public String encodeToken(SecurityToken token) throws SecurityTokenException {
+    return decoder.encodeToken(token);
+  }
 }

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java?rev=937568&r1=937567&r2=937568&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java Sat Apr 24 00:52:02 2010
@@ -49,4 +49,6 @@ public interface SecurityTokenDecoder {
    */
   SecurityToken createToken(Map<String, String> tokenParameters)
       throws SecurityTokenException;
+
+  String encodeToken(SecurityToken token) throws SecurityTokenException;
 }

Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java?rev=937568&r1=937567&r2=937568&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java Sat Apr 24 00:52:02 2010
@@ -23,6 +23,7 @@ import org.apache.shindig.auth.SecurityT
 import org.apache.shindig.auth.SecurityTokenDecoder;
 
 import com.google.common.collect.Maps;
+import org.apache.shindig.auth.SecurityTokenException;
 
 import java.util.Map;
 
@@ -208,5 +209,9 @@ public class FakeGadgetToken implements 
     public SecurityToken createToken(Map<String, String> tokenParameters)  {
       return FakeGadgetToken.createToken(tokenParameters);
     }
+
+    public String encodeToken(SecurityToken token) throws SecurityTokenException {
+      return null; // NOT USED
+    }
   }
 }