Author: beaton
Date: Sun May 17 20:38:18 2009
New Revision: 775755
URL: http://svn.apache.org/viewvc?rev=775755&view=rev
Log:
Fix javascript error for OAuth 1.0 service providers redirecting to
callback URL.
Also make the shindigoauth example gadget work when Shindig is
configured to support only OAuth 1.0.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
incubator/shindig/trunk/javascript/samplecontainer/examples/shindigoauth.xml
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java?rev=775755&r1=775754&r2=775755&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
Sun May 17 20:38:18 2009
@@ -69,11 +69,14 @@
"</head>\n" +
"<body>\n" +
"<script type='text/javascript'>\n" +
+ "try {\n" +
" if (window.opener && window.opener.gadgets &&
window.opener.gadgets.oauth\n" +
" && window.opener.gadgets.oauth.Popup) {\n" +
"
window.opener.gadgets.oauth.Popup.setReceivedCallbackUrl(document.location.href);\n"
+
" }\n" +
- " window.close();\n" +
+ "} catch (e) {\n" +
+ "}\n" +
+ "window.close();\n" +
"</script>\n" +
"Close this window.\n" +
"</body>\n" +
Modified:
incubator/shindig/trunk/javascript/samplecontainer/examples/shindigoauth.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/shindigoauth.xml?rev=775755&r1=775754&r2=775755&view=diff
==============================================================================
---
incubator/shindig/trunk/javascript/samplecontainer/examples/shindigoauth.xml
(original)
+++
incubator/shindig/trunk/javascript/samplecontainer/examples/shindigoauth.xml
Sun May 17 20:38:18 2009
@@ -23,7 +23,7 @@
<OAuth>
<Service name="shindig">
<Request url="http://localhost:8080/oauth/requestToken"; />
- <Authorization url="http://localhost:8080/oauth/authorize"; />
+ <Authorization
url="http://localhost:8080/oauth/authorize?oauth_callback=http://localhost:8080/gadgets/oauthcallback";
/>
<Access url="http://localhost:8080/oauth/accessToken"; />
</Service>
</OAuth>
