OdnoklassnikiService should consider params in a body while signing the request (thanks to https://github.com/MrNeuronix)

kullfar · kullfar · commit 85e8e621dcb0 · 2017-05-15T17:50:13.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
@@ -12,7 +12,6 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -30,19 +29,14 @@ public void signRequest(OAuth2AccessToken accessToken, OAuthRequest request) {
         try {
             final String tokenDigest = md5Hex(accessToken.getAccessToken() + getConfig().getApiSecret());
 
-            ParameterList queryParams = request.getQueryStringParams();
-            ParameterList bodyParams = request.getBodyParams();
-            queryParams.addAll(bodyParams);
-            Collections.sort(queryParams.getParams());
-
-            List<String> params = new ArrayList<>();
-            for(Parameter param : queryParams.getParams()) {
-                params.add(param.getKey().concat("=").concat(param.getValue()));
-            }
+            final ParameterList queryParams = request.getQueryStringParams();
+            queryParams.addAll(request.getBodyParams());
+            final List<Parameter> allParams = queryParams.getParams();
 
+            Collections.sort(allParams);
             final StringBuilder builder = new StringBuilder();
-            for (String param : params) {
-                builder.append(param);
+            for (Parameter param : allParams) {
+                builder.append(param.getKey()).append('=').append(param.getValue());
             }
 
             final String sigSource = URLDecoder.decode(builder.toString(), CharEncoding.UTF_8) + tokenDigest;

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`