Implemented Vkontakte.ru support

src/main/java/org/scribe/builder/api/VkontakteApi.java

@@ -0,0 +1,41 @@
+package org.scribe.builder.api;
+
+import org.scribe.extractors.*;
+import org.scribe.utils.*;
+import org.scribe.model.*;
+
+/**
+ * @author Boris G. Tsirkin <mail@dotbg.name>
+ * @since 20.4.2011
+ */
+public class VkontakteApi extends DefaultApi20
+{
+  private static final String AUTHORIZE_URL = "https://api.vkontakte.ru/oauth/authorize?client_id=%s&redirect_uri=%s&response_type=code";
+  private static final String SCOPED_AUTHORIZE_URL = String.format("%s&scope=%%s", AUTHORIZE_URL);
+
+  @Override
+  public String getAccessTokenEndpoint()
+  {
+    return "https://api.vkontakte.ru/oauth/access_token";
+  }
+
+  @Override
+  public String getAuthorizationUrl(OAuthConfig config)
+  {
+    Preconditions.checkValidUrl(config.getCallback(), "Valid url is required for a callback. Vkontakte does not support OOB");
+    if(config.hasScope())// Appending scope if present
+    {
+     return String.format(SCOPED_AUTHORIZE_URL, config.getApiKey(), URLUtils.formURLEncode(config.getCallback()),URLUtils.formURLEncode(config.getScope()));
+    }
+    else
+    {
+      return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.formURLEncode(config.getCallback()));
+    }
+  }
+
+  @Override
+  public AccessTokenExtractor getAccessTokenExtractor()
+  {
+    return new JsonTokenExtractor();
+  }
+}

src/main/java/org/scribe/extractors/JsonTokenExtractor.java

@@ -8,7 +8,7 @@ import org.scribe.utils.*;
 
 public class JsonTokenExtractor implements AccessTokenExtractor
 {
-  private Pattern accessTokenPattern = Pattern.compile("\"access_token\":\"(\\S*)\"");
+  private Pattern accessTokenPattern = Pattern.compile("\"access_token\":\"(\\S*?)\"");
 
   @Override
   public Token extract(String response)
@@ -17,11 +17,11 @@ public class JsonTokenExtractor implements AccessTokenExtractor
     Matcher matcher = accessTokenPattern.matcher(response);
     if(matcher.find())
     {
-      return new Token(matcher.group(1), "");
+      return new Token(matcher.group(1), "", response);
     }
     else
     {
-      throw new OAuthException("Cannot extract an acces token. Response was: "+response);
+      throw new OAuthException("Cannot extract an acces token. Response was: " + response);
     }
   }