fix: allow spaces in scope param in OAuth2Accesstoken response

kullfar · kullfar · commit 255a8e622a34 · 2018-03-07T12:57:07.000+03:00
diff --git a/changelog b/changelog
@@ -4,6 +4,7 @@
  * fix Pinterest API (thanks to https://github.com/sschwieb)
  * add Yahoo2 API (thanks to https://github.com/javatestcase)
  * fix Tumblr urls, convert to https (thanks to https://github.com/highthunder)
+ * fix: allow spaces in scope param in OAuth2Accesstoken response
 
 [5.2.0-java7again]
  * allow 'null' as callback. It's an optional parameter. Remove "oob" as default (thanks to https://github.com/massongit)
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java
@@ -19,7 +19,7 @@ public class OAuth2AccessTokenJsonExtractor implements TokenExtractor<OAuth2Acce
     private static final Pattern TOKEN_TYPE_REGEX_PATTERN = Pattern.compile("\"token_type\"\\s*:\\s*\"(\\S*?)\"");
     private static final Pattern EXPIRES_IN_REGEX_PATTERN = Pattern.compile("\"expires_in\"\\s*:\\s*\"?(\\d*?)\"?\\D");
     private static final Pattern REFRESH_TOKEN_REGEX_PATTERN = Pattern.compile("\"refresh_token\"\\s*:\\s*\"(\\S*?)\"");
-    private static final Pattern SCOPE_REGEX_PATTERN = Pattern.compile("\"scope\"\\s*:\\s*\"(\\S*?)\"");
+    private static final Pattern SCOPE_REGEX_PATTERN = Pattern.compile("\"scope\"\\s*:\\s*\"([^\"]*?)\"");
     private static final Pattern ERROR_REGEX_PATTERN = Pattern.compile("\"error\"\\s*:\\s*\"(\\S*?)\"");
     private static final Pattern ERROR_DESCRIPTION_REGEX_PATTERN
             = Pattern.compile("\"error_description\"\\s*:\\s*\"([^\"]*?)\"");
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
@@ -13,13 +13,36 @@
 
 public class OAuth2AccessTokenJsonExtractorTest {
 
-    private static final String RESPONSE = "'{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\"}'";
     private final OAuth2AccessTokenJsonExtractor extractor = OAuth2AccessTokenJsonExtractor.instance();
 
     @Test
     public void shouldParseResponse() throws IOException {
-        final OAuth2AccessToken token = extractor.extract(ok(RESPONSE));
-        assertEquals(token.getAccessToken(), "I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X");
+        final OAuth2AccessToken token = extractor.extract(
+                ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\"}"));
+        assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X", token.getAccessToken());
+    }
+
+    @Test
+    public void shouldParseScopeFromResponse() throws IOException {
+        OAuth2AccessToken token = extractor.extract(
+                ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T4X\", "
+                        + "\"scope\":\"s1\"}"));
+        assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T4X", token.getAccessToken());
+        assertEquals("s1", token.getScope());
+
+        token = extractor.extract(
+                ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X\", "
+                        + "\"scope\":\"s1 s2\"}"));
+        assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X", token.getAccessToken());
+        assertEquals("s1 s2", token.getScope());
+
+        token = extractor.extract(
+                ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X\", "
+                        + "\"scope\":\"s3 s4\", "
+                        + "\"refresh_token\":\"refresh_token1\"}"));
+        assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X", token.getAccessToken());
+        assertEquals("s3 s4", token.getScope());
+        assertEquals("refresh_token1", token.getRefreshToken());
     }
 
     @Test(expected = IllegalArgumentException.class)
