Fix error when "parameter" option is disabled and header not set.

Closes #47
ADmad · Jan 7, 2017 · 5d26893 · 5d26893
1 parent 6e0235e
commit 5d26893
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Auth/JwtAuthenticate.php b/src/Auth/JwtAuthenticate.php
@@ -191,10 +191,10 @@ public function getToken($request = null)
         }
 
         if (!empty($this->_config['parameter'])) {
-            $token = $request->query($this->_config['parameter']);
+            $this->_token = $request->query($this->_config['parameter']);
         }
 
-        return $this->_token = $token;
+        return $this->_token;
     }
 
     /**

diff --git a/tests/TestCase/Auth/JwtAuthenticateTest.php b/tests/TestCase/Auth/JwtAuthenticateTest.php
@@ -99,6 +99,24 @@ public function testAuthenticateTokenHeader()
         $this->assertFalse($result);
     }
 
+    /**
+     * test authenticate no token present in header "parameter" option disabled.
+     *
+     * @return void
+     */
+    public function testAuthenticateNoHeaderWithParameterDisabled()
+    {
+        $request = new Request('posts/index');
+
+        $this->auth = new JwtAuthenticate($this->Registry, [
+            'userModel' => 'Users',
+            'parameter' => false
+        ]);
+
+        $result = $this->auth->getUser($request, $this->response);
+        $this->assertFalse($result);
+    }
+
     /**
      * test returning payload without querying database.
      *