The base string params must be urlencoded - (en/de)code them.

cedel1 · May 29, 2016 · 76286a4 · 76286a4
1 parent 38ab204
commit 76286a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/EventListener/OAuthRequestListener.php b/EventListener/OAuthRequestListener.php
@@ -97,10 +97,10 @@ protected function parseAuthorizationHeader(Request $request)
                 continue;
             }
 
-            $key   = trim($split[0]);
-            $value = str_replace('"', '', trim($split[1]));
+            $key   = rawurldecode(trim($split[0]));
+            $value = rawurldecode(str_replace('"', '', trim($split[1])));
 
-            $params[$key] = rawurldecode($value);
+            $params[$key] = $value;
         }
 
         return $params;

diff --git a/Service/OAuthAbstractServerService.php b/Service/OAuthAbstractServerService.php
@@ -314,10 +314,10 @@ protected function normalizeRequestParameters($requestParameters)
 
                     sort($sortedValues);
                     foreach ($sortedValues as $sortedValue) {
-                        $normalizedParameters[] = $key . '=' . $sortedValue;
+                        $normalizedParameters[] = rawurlencode($key) . '=' . rawurlencode($sortedValue);
                     }
                 } else {
-                    $normalizedParameters[] = $key . '=' . $value;
+                    $normalizedParameters[] = rawurlencode($key) . '=' . rawurlencode($value);
                 }
             }
         }