Merge branch 'MrNeuronix-master'

kullfar · kullfar · commit 51725d32fc11 · 2017-05-15T17:50:51.000+03:00
diff --git a/changelog b/changelog
@@ -1,6 +1,7 @@
 [SNAPSHOT]
  * omit the client_secret parameter if it is an empty string while refreshing token (thanks to https://github.com/KungfuPancake)
  * allow perms to be specified in Flickr Api (read, write, or delete) (thanks to https://github.com/rogerhu)
+ * OdnoklassnikiService should consider params in a body while signing the request (thanks to https://github.com/MrNeuronix)
 
 [4.1.0]
  * make client_secret optional in OAuth2 while requesting AccessToken (if set to null, it's not required by OAuth2 specs)
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/LinkedInApi.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/LinkedInApi.java
@@ -20,6 +20,7 @@ public LinkedInApi() {
     }
 
     /**
+     * @param scopes scopes
      * @deprecated use {@link #instance(java.lang.String...) }
      */
     @Deprecated
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/service/OdnoklassnikiServiceImpl.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/service/OdnoklassnikiServiceImpl.java
@@ -1,15 +1,21 @@
 package com.github.scribejava.apis.service;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import org.apache.commons.codec.CharEncoding;
-import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
 import com.github.scribejava.core.builder.api.DefaultApi20;
 import com.github.scribejava.core.model.OAuth2AccessToken;
 import com.github.scribejava.core.model.OAuthConfig;
 import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Parameter;
+import com.github.scribejava.core.model.ParameterList;
 import com.github.scribejava.core.oauth.OAuth20Service;
-import java.util.Arrays;
+
+import org.apache.commons.codec.CharEncoding;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Collections;
+import java.util.List;
+
+import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
 
 public class OdnoklassnikiServiceImpl extends OAuth20Service {
 
@@ -23,20 +29,19 @@ public void signRequest(OAuth2AccessToken accessToken, OAuthRequest request) {
         try {
             final String tokenDigest = md5Hex(accessToken.getAccessToken() + getConfig().getApiSecret());
 
-            final String completeUrl = request.getCompleteUrl();
-            final int queryIndex = completeUrl.indexOf('?');
-            if (queryIndex != -1) {
-                final String[] params = completeUrl.substring(queryIndex + 1).split("&");
-                Arrays.sort(params);
-                final StringBuilder builder = new StringBuilder();
-                for (String param : params) {
-                    builder.append(param);
-                }
-
-                final String sigSource = URLDecoder.decode(builder.toString(), CharEncoding.UTF_8) + tokenDigest;
-                request.addQuerystringParameter("sig", md5Hex(sigSource).toLowerCase());
+            final ParameterList queryParams = request.getQueryStringParams();
+            queryParams.addAll(request.getBodyParams());
+            final List<Parameter> allParams = queryParams.getParams();
+
+            Collections.sort(allParams);
+            final StringBuilder builder = new StringBuilder();
+            for (Parameter param : allParams) {
+                builder.append(param.getKey()).append('=').append(param.getValue());
             }
 
+            final String sigSource = URLDecoder.decode(builder.toString(), CharEncoding.UTF_8) + tokenDigest;
+            request.addQuerystringParameter("sig", md5Hex(sigSource).toLowerCase());
+
             super.signRequest(accessToken, request);
         } catch (UnsupportedEncodingException unex) {
             throw new IllegalStateException(unex);

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public LinkedInApi() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
	`23`	`+ * @param scopes scopes`
`23`	`24`	`* @deprecated use {@link #instance(java.lang.String...) }`
`24`	`25`	`*/`
`25`	`26`	`@Deprecated`