Author: [email protected]
Date: Mon Mar 26 16:49:26 2012
New Revision: 2157
Log:
[AMDATUAUTH-129] Extended information displayed by protected resource
Modified:
trunk/amdatu-auth/oauth-example/consumer/src/main/resources/jsp/3leggedOAuthGadget.jspf
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
Modified:
trunk/amdatu-auth/oauth-example/consumer/src/main/resources/jsp/3leggedOAuthGadget.jspf
==============================================================================
---
trunk/amdatu-auth/oauth-example/consumer/src/main/resources/jsp/3leggedOAuthGadget.jspf
(original)
+++
trunk/amdatu-auth/oauth-example/consumer/src/main/resources/jsp/3leggedOAuthGadget.jspf
Mon Mar 26 16:49:26 2012
@@ -90,6 +90,7 @@
params[gadgets.io.RequestParameters.AUTHORIZATION] =
gadgets.io.AuthorizationType.OAUTH;
params[gadgets.io.RequestParameters.METHOD] =
gadgets.io.MethodType.GET;
params[gadgets.io.RequestParameters.OAUTH_SERVICE_NAME] =
"oauth-example";
+ params[gadgets.io.RequestParameters.OAUTH_USE_TOKEN] = "always";
gadgets.io.makeRequest(url, function (response) {
if (response.oauthApprovalUrl) {
Modified:
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
(original)
+++
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
Mon Mar 26 16:49:26 2012
@@ -102,21 +102,36 @@
try {
String response = "<p>OAuth validation successfull. OAuth
parameters received by service provider:<br/><br/>";
- response += "<table><tr><th align=\"left\">parameter</th><th
align=\"left\">value</th></tr>";
+ response += "<table>";
OAuthMessage requestMessage = OAuthServlet.getMessage(request,
null);
m_tokenProvider.validateOAuthMessage(requestMessage);
- Token token = m_tokenProvider.getToken(requestMessage);
- response += "<tr><td>token</td><td>" + token.getToken() +
"</td></tr>";
- response += "<tr><td>token secret</td><td>" +
token.getTokenSecret() + "</td></tr>";
- response += "<tr><td>token type id</td><td>" +
token.getProperty(OAuthTokenProvider.TOKEN_TYPE_PROPERTY) + "</td></tr>";
- response += "<tr><td>token authorized</td><td>" +
token.getProperty(OAuthTokenProvider.TOKEN_AUTHORIZED_PROPERTY) + "</td></tr>";
- response += "<tr><td>token timestamp</td><td>" +
token.getProperty(OAuthTokenProvider.LAST_USED_TIMESTAMP_PROPERTY) +
"</td></tr>";
-
- response += "<tr><td>consumer key</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_CONSUMER_KEY) + "</td></tr>";
- response += "<tr><td>callback url</td><td>" +
token.getProperty(OAuthTokenProvider.CALLBACK_URL_PROPERTY) + "</td></tr>";
- response += "<tr><td>user id</td><td>" +
token.getProperty(OAuthTokenProvider.USERID_PROPERTY) + "</td></tr>";
- response += "<tr><td>verifier</td><td>" +
token.getProperty(OAuthTokenProvider.VERIFIER_PROPERTY) + "</td></tr>";
-
+ Token token = m_tokenProvider.getToken(requestMessage);
+
+ response += "<tr><th colspan='2'>Token properties</th></tr>";
+ response += "<tr><td>token</td><td>" + (token != null ?
token.getToken() : "") + "</td></tr>";
+ response += "<tr><td>token secret</td><td>" + (token != null ?
token.getTokenSecret() : "") + "</td></tr>";
+ response += "<tr><td>token type id</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.TOKEN_TYPE_PROPERTY) : "") + "</td></tr>";
+ response += "<tr><td>token authorized</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.TOKEN_AUTHORIZED_PROPERTY) : "") +
"</td></tr>";
+ response += "<tr><td>token timestamp</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.LAST_USED_TIMESTAMP_PROPERTY) : "") +
"</td></tr>";
+ response += "<tr><td>callback url</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.CALLBACK_URL_PROPERTY) : "") +
"</td></tr>";
+ response += "<tr><td>user id</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.USERID_PROPERTY) : "") + "</td></tr>";
+ response += "<tr><td>verifier</td><td>" + (token != null ?
token.getProperty(OAuthTokenProvider.VERIFIER_PROPERTY) : "") + "</td></tr>";
+
+ response += "<tr><td> </td><td/></tr><tr><th
colspan='2'>OAuth parameters</th></tr>";
+ response += "<tr><td>oauth_version</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_VERSION) + "</td></tr>";
+ response += "<tr><td>oauth_timestamp</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_TIMESTAMP) + "</td></tr>";
+ response += "<tr><td>oauth_nonce</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_NONCE) + "</td></tr>";
+ response += "<tr><td>oauth_signature_method</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_SIGNATURE_METHOD) + "</td></tr>";
+ response += "<tr><td>oauth_signature</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_SIGNATURE) + "</td></tr>";
+ response += "<tr><td>oauth_consumer_key</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_CONSUMER_KEY) + "</td></tr>";
+ response += "<tr><td>oauth_verifier</td><td>" +
requestMessage.getParameter(OAuth.OAUTH_VERIFIER) + "</td></tr>";
+
+ response += "<tr><td> </td><td/></tr><tr><th
colspan='2'>OpenSocial parameters</th></tr>";
+ response += "<tr><td>opensocial_viewer_id</td><td>" +
requestMessage.getParameter("opensocial_viewer_id") + "</td></tr>";
+ response += "<tr><td>opensocial_owner_id</td><td>" +
requestMessage.getParameter("opensocial_owner_id") + "</td></tr>";
+ response += "<tr><td>opensocial_app_id</td><td>" +
requestMessage.getParameter("opensocial_app_id") + "</td></tr>";
+ response += "<tr><td>opensocial_app_url</td><td>" +
requestMessage.getParameter("opensocial_app_url") + "</td></tr>";
+
response += "</table></p>";
return Response.ok(response,
MediaType.TEXT_HTML).cacheControl(cc).build();
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
