svn commit: r1298047 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java

[hsaputra]

Author: hsaputra
Date: Wed Mar  7 19:22:11 2012
New Revision: 1298047

URL: http://svn.apache.org/viewvc?rev=1298047&view=rev
Log:
SHINDIG-1719 | Fix the UnsupportedOperationException with blob crypter. This is 
bc the GadgetsHandler use bean delegator that didnt set the activeUrl method. 
The Blob crypter codec checks if the token is not instance of 
AbstractSecurityToken it will call the BlobCrypterSecurityToken.fromToken that 
internally call the getActiveUrl.

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1298047&r1=1298046&r2=1298047&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 Wed Mar  7 19:22:11 2012
@@ -261,7 +261,7 @@ public class GadgetsHandlerService {
   }
   /**
    * Create security token
-   * @param request token paramaters (gadget, owner and viewer)
+   * @param request token parameters (gadget, owner and viewer)
    * @return Security token
    * @throws SecurityTokenException
    */
@@ -288,7 +288,7 @@ public class GadgetsHandlerService {
 
     if (moduleId != null) {
       tokenData = convertAuthContext(authContext, request.getContainer(),
-          request.getUrl().toString(), moduleId);
+          request.getUrl().toString(), moduleId, request.getUrl().toString());
       token = securityTokenCodec.encodeToken(tokenData);
     }
 
@@ -523,17 +523,17 @@ public class GadgetsHandlerService {
 
   private SecurityToken convertAuthContext(GadgetsHandlerApi.AuthContext 
authContext,
       String container, String url) {
-    return convertAuthContext(authContext, container, url, 0);
+    return convertAuthContext(authContext, container, url, 0, url);
   }
 
   private SecurityToken convertAuthContext(GadgetsHandlerApi.AuthContext 
authContext,
-      String container, String url, long moduleId) {
+      String container, String url, long moduleId, String activeUrl) {
     if (authContext == null) {
       return null;
     }
     return beanDelegator.createDelegator(authContext, SecurityToken.class,
         ImmutableMap.<String, Object>of("container", container,
-            "appid", url, "appurl", url, "moduleId", moduleId));
+            "appid", url, "appurl", url, "moduleId", moduleId, "activeurl", 
activeUrl));
   }
 
   public GadgetsHandlerApi.BaseResponse createErrorResponse(Uri uri, Exception 
e,