Author: [email protected]
Date: Tue Jan 24 11:55:17 2012
New Revision: 1982
Log:
[AMDATUOPENSOCIAL-188] Fixed by adding a new security token to a gadget, even
if its gadgetspec could not be retrieved
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
Tue Jan 24 11:55:17 2012
@@ -292,11 +292,7 @@
// Generate a security token and retrieve the title and height
from the spec
updateWidget(widget, request);
-
- // Verify if a security token was generfated successfully, only
append the widget if that succeeded
- if (widget.getMetadata().getSecureToken() != null) {
- widgets.add(widget);
- }
+ widgets.add(widget);
}
return widgets;
}
@@ -327,15 +323,18 @@
*/
private void updateWidget(DashboardWidget widget, HttpServletRequest
request) {
if (widget.getMetadata() != null) {
+ // First generate a new security token. We do that also for
gadgets of
+ // which the spec cannot be retrieved (otherwise the user is
presented a 401
+ // error - invalid security token, instead of the actual error)
+ String gadgetUrl = widget.getMetadata().getGadgetUrl();
+ String st = generateSecurityToken(gadgetUrl, request);
+ widget.getMetadata().setSecureToken(st);
+
Map<String, String> gadgetSpec =
- getOpenSocialContainer().getGadgetSpec(request,
widget.getMetadata().getGadgetUrl(), null);
+ getOpenSocialContainer().getGadgetSpec(request, gadgetUrl,
null);
if (gadgetSpec != null) {
widget.setHeight(getGadgetSpecValue(gadgetSpec, "height", ""));
widget.setTitle(getGadgetSpecValue(gadgetSpec, "title", ""));
-
- String gadgetUrl = widget.getMetadata().getGadgetUrl();
- String st = generateSecurityToken(gadgetUrl, request);
- widget.getMetadata().setSecureToken(st);
}
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
