Add load balancer support using non-standard X-Forwarded headers

CONTRIBUTORS.md

@@ -8,4 +8,3 @@ Andy Smith authored the original code (http://oauth.googlecode.com/svn/code/php/
  * Jacob Kiers (@jacobkiers)
  * Alexandru G. (@vimishor)
  * Victor Bjelkholm (@VictorBjelkholm)
- * David Macek (@elieux)

src/JacobKiers/OAuth/Request/Request.php

@@ -93,10 +93,17 @@ public function __construct($http_method, $http_url, array $parameters = null)
     public static function fromRequest($http_method = null, $http_url = null, $parameters = null)
     {
         $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on') ? 'http' : 'https';
+        $scheme = isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
+            ? $_SERVER['HTTP_X_FORWARDED_PROTO']
+            : $scheme;
+        $port = isset($_SERVER['HTTP_X_FORWARDED_PORT'])
+            ? $_SERVER['HTTP_X_FORWARDED_PORT']
+            : $_SERVER['SERVER_PORT'];
+
         $http_url = ($http_url) ? $http_url : $scheme .
             '://' . $_SERVER['HTTP_HOST'] .
             ':' .
-            $_SERVER['SERVER_PORT'] .
+            $port .
             $_SERVER['REQUEST_URI'];
         $http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD'];
 

src/JacobKiers/OAuth/Server.php

@@ -243,7 +243,7 @@ private function getToken(RequestInterface $request, ConsumerInterface $consumer
 
         $token = $this->data_store->lookupToken($consumer, $token_type, $token_key);
         if (!$token) {
-            throw new OAuthException("Invalid $token_type token: $token_key");
+            throw new OAuthException("Invalid $token_type token: $token_field");
         }
         return $token;
     }