From bb872e4466477eb2ee8b8c08c7fbc73c0f829c6a Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Wed, 23 Feb 2011 11:22:17 -0300 Subject: [PATCH] Changed percentEncodings --- src/main/java/org/scribe/builder/api/FacebookApi.java | 2 +- .../java/org/scribe/extractors/TokenExtractorImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/scribe/builder/api/FacebookApi.java b/src/main/java/org/scribe/builder/api/FacebookApi.java index c945520..bcda56e 100644 --- a/src/main/java/org/scribe/builder/api/FacebookApi.java +++ b/src/main/java/org/scribe/builder/api/FacebookApi.java @@ -11,6 +11,6 @@ public class FacebookApi extends DefaultApi20 public String getAuthorizationUrl(OAuthConfig config) { Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Facebook does not support OOB"); - return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.percentEncode(config.getCallback())); + return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.formURLEncode(config.getCallback())); } } diff --git a/src/main/java/org/scribe/extractors/TokenExtractorImpl.java b/src/main/java/org/scribe/extractors/TokenExtractorImpl.java index 2bc0aa0..e5dac17 100644 --- a/src/main/java/org/scribe/extractors/TokenExtractorImpl.java +++ b/src/main/java/org/scribe/extractors/TokenExtractorImpl.java @@ -27,10 +27,11 @@ public class TokenExtractorImpl implements RequestTokenExtractor, AccessTokenExt Matcher matcher = Pattern.compile(TOKEN_REGEX).matcher(response); if (matcher.matches()) { - String token = URLUtils.percentDecode(matcher.group(1)); - String secret = URLUtils.percentDecode(matcher.group(2)); + String token = URLUtils.formURLDecode(matcher.group(1)); + String secret = URLUtils.formURLDecode(matcher.group(2)); return new Token(token, secret); - } else + } + else { throw new OAuthException("Response body is incorrect. Can't extract a token from this: '" + response + "'", null); }