From 618d84ddcfceecaffeaf03641f91d8a3f29dd215 Mon Sep 17 00:00:00 2001
From: ApolloPY <ApolloPY@Gmail.com>
Date: Sat, 22 Aug 2015 01:47:59 +0800
Subject: [PATCH] Mac token only get to header

---
 src/ResourceServer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ResourceServer.php b/src/ResourceServer.php
index ab9ebec4..245cb4e2 100644
--- a/src/ResourceServer.php
+++ b/src/ResourceServer.php
@@ -19,6 +19,7 @@ use League\OAuth2\Server\Storage\ClientInterface;
 use League\OAuth2\Server\Storage\ScopeInterface;
 use League\OAuth2\Server\Storage\SessionInterface;
 use League\OAuth2\Server\TokenType\Bearer;
+use League\OAuth2\Server\TokenType\MAC;
 
 /**
  * OAuth 2.0 Resource Server
@@ -139,7 +140,7 @@ class ResourceServer extends AbstractServer
     {
         if ($this->getRequest()->headers->get('Authorization') !== null) {
             $accessToken = $this->getTokenType()->determineAccessTokenInHeader($this->getRequest());
-        } elseif ($headerOnly === false) {
+        } elseif ($headerOnly === false && (! $this->getTokenType() instanceof MAC)) {
             $accessToken = ($this->getRequest()->server->get('REQUEST_METHOD') === 'GET')
                                 ? $this->getRequest()->query->get($this->tokenKey)
                                 : $this->getRequest()->request->get($this->tokenKey);