Merge pull request laravel#1255 from joual/develop

taylorotwell · taylorotwell · commit 9acf541653be · 2012-09-25T18:32:36.000-07:00
Auth token now nulled on logout
diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php
@@ -127,6 +127,8 @@ public function logout()
 		$this->cookie($this->recaller(), null, -2000);
 
 		Session::forget($this->token());
+
+    $this->token = null;
 	}
 
 	/**
diff --git a/laravel/tests/cases/auth.test.php b/laravel/tests/cases/auth.test.php
@@ -294,9 +294,6 @@ public function testLogoutMethodLogsOutUser()
 
 		Auth::logout();
 
-		// A workaround since Cookie will is only stored in memory, until Response class is called.
-		Auth::driver()->token = null;
-
 		$this->assertNull(Auth::user());
 
 		$this->assertFalse(isset(Session::$instance->session['data']['laravel_auth_drivers_fluent_login']));

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,8 @@ public function logout()`
`127`	`127`	`$this->cookie($this->recaller(), null, -2000);`
`128`	`128`
`129`	`129`	`Session::forget($this->token());`
	`130`	`+`
	`131`	`+ $this->token = null;`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`/**`