Fixed bug in basic auth.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
dingo · Dec 1, 2014 · def08e5 · def08e5
1 parent 0f1384d
commit def08e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/src/Auth/BasicProvider.php b/src/Auth/BasicProvider.php
@@ -47,7 +47,7 @@ public function authenticate(Request $request, Route $route)
     {
         $this->validateAuthorizationHeader($request);
 
-        if (is_null($response = $this->auth->onceBasic($this->identifier, $request)) || $response->getStatusCode() === 401) {
+        if (($response = $this->auth->onceBasic($this->identifier, $request)) && $response->getStatusCode() === 401) {
             throw new UnauthorizedHttpException('Basic', 'Invalid authentication credentials.');
         }
 

diff --git a/tests/Auth/BasicProviderTest.php b/tests/Auth/BasicProviderTest.php
@@ -37,24 +37,11 @@ public function testInvalidBasicCredentialsThrowsException()
     }
 
 
-    /**
-     * @expectedException \Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException
-     */
-    public function testNullResponseFromAuthManagerThrowsException()
-    {
-        $request = Request::create('GET', '/', [], [], [], ['HTTP_AUTHORIZATION' => 'Basic 12345']);
-
-        $this->auth->shouldReceive('onceBasic')->once()->with('email', $request)->andReturn(null);
-
-        $this->provider->authenticate($request, new Route(['GET'], '/', []));
-    }
-
-
     public function testValidCredentialsReturnsUser()
     {
         $request = Request::create('GET', '/', [], [], [], ['HTTP_AUTHORIZATION' => 'Basic 12345']);
 
-        $this->auth->shouldReceive('onceBasic')->once()->with('email', $request)->andReturn(new Response('', 200));
+        $this->auth->shouldReceive('onceBasic')->once()->with('email', $request)->andReturn(null);
         $this->auth->shouldReceive('user')->once()->andReturn('foo');
 
         $this->assertEquals('foo', $this->provider->authenticate($request, new Route(['GET'], '/', [])));