You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/07/14 19:53:06 UTC
svn commit: r964110 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
Author: johnh
Date: Wed Jul 14 17:53:06 2010
New Revision: 964110
URL: http://svn.apache.org/viewvc?rev=964110&view=rev
Log:
Slight refactor of DefaultIframeUriManager affording more flexibility in when to add a security token to a rendering URI.
Also, uses concrete (non-templatized) token if such token is provided.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=964110&r1=964109&r2=964110&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java Wed Jul 14 17:53:06 2010
@@ -156,12 +156,12 @@ public class DefaultIframeUriManager imp
versioner.version(gadget.getSpec().getUrl(), container), false, false);
}
- if (gadget.getAllFeatures().contains(SECURITY_TOKEN_FEATURE_NAME) ||
- config.getBool(container, SECURITY_TOKEN_ALWAYS_KEY)) {
+ if (wantsSecurityToken(gadget)) {
boolean securityTokenOnQuery = isTokenNeededForRendering(gadget);
- String securityToken = wantsSecurityToken(gadget) ? generateSecurityToken(gadget) : null;
- addParam(uri, Param.SECURITY_TOKEN.getKey(), securityToken, true, !securityTokenOnQuery);
+ String securityToken = generateSecurityToken(gadget);
+ addParam(uri, Param.SECURITY_TOKEN.getKey(), securityToken, securityToken != null,
+ !securityTokenOnQuery);
}
addExtras(uri);
@@ -184,7 +184,8 @@ public class DefaultIframeUriManager imp
}
protected boolean wantsSecurityToken(Gadget gadget) {
- return true;
+ return gadget.getAllFeatures().contains(SECURITY_TOKEN_FEATURE_NAME) ||
+ config.getBool(gadget.getContext().getContainer(), SECURITY_TOKEN_ALWAYS_KEY);
}
// This method should be overridden to provide better caching characteristics