Repository: camel Updated Branches: refs/heads/master 1b0f11626 -> 263b56814
CAMEL-7279 - Yammer now uses bearer token for auth Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/263b5681 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/263b5681 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/263b5681 Branch: refs/heads/master Commit: 263b568146ee94b3bf781ba77bd6415514bc452f Parents: 1b0f116 Author: Jonathan Anstey <[email protected]> Authored: Fri Mar 7 13:13:18 2014 -0330 Committer: Jonathan Anstey <[email protected]> Committed: Fri Mar 7 13:14:52 2014 -0330 ---------------------------------------------------------------------- .../component/yammer/ScribeApiRequestor.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/263b5681/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/ScribeApiRequestor.java ---------------------------------------------------------------------- diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/ScribeApiRequestor.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/ScribeApiRequestor.java index 6d2ac99..7bdf605 100644 --- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/ScribeApiRequestor.java +++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/ScribeApiRequestor.java @@ -20,9 +20,12 @@ import org.scribe.model.OAuthConstants; import org.scribe.model.OAuthRequest; import org.scribe.model.Response; import org.scribe.model.Verb; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ScribeApiRequestor implements ApiRequestor { + private static final Logger LOG = LoggerFactory.getLogger(ScribeApiRequestor.class); String apiUrl; String apiAccessToken; @@ -32,8 +35,21 @@ public class ScribeApiRequestor implements ApiRequestor { } private String send(Verb verb, String params) throws Exception { - OAuthRequest request = new OAuthRequest(verb, apiUrl + ((params != null) ? params : "")); + String url = apiUrl + ((params != null) ? params : ""); + + OAuthRequest request = new OAuthRequest(verb, url); request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, apiAccessToken); + + // For more details on the âBearerâ token refer to http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-23 + StringBuilder sb = new StringBuilder(); + sb.append("Bearer "); + sb.append(apiAccessToken); + request.addHeader("Authorization", sb.toString()); + + if (LOG.isDebugEnabled()) { + LOG.debug("Yammer request url: %s", request.getCompleteUrl()); + } + Response response = request.send(); if (response.isSuccessful()) { return response.getBody();
