Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring / comment clean-up on Auth class.

This commit is contained in:
Taylor Otwell 2011-07-06 13:37:59 -07:00
parent 6fc0770bce
commit 39d3ccb8f0
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
system/auth.php
View File

@ -29,15 +29,12 @@ public static function check()
/** /**
* Get the current user of the application. * Get the current user of the application.
* *
* The user will be loaded using the user ID stored in the session.
*
* @return object * @return object
*/ */
public static function user() public static function user()
{ {
// -----------------------------------------------------
// Verify that sessions are enabled. Since the user ID
// is stored in the session, we can't authenticate
// without a session driver specified.
// -----------------------------------------------------
if (Config::get('session.driver') == '') if (Config::get('session.driver') == '')
{ {
throw new \Exception("You must specify a session driver before using the Auth class."); throw new \Exception("You must specify a session driver before using the Auth class.");
@ -45,9 +42,6 @@ public static function user()
$model = static::model(); $model = static::model();
// -----------------------------------------------------
// Load the user using the ID stored in the session.
// -----------------------------------------------------
if (is_null(static::$user) and Session::has(static::$key)) if (is_null(static::$user) and Session::has(static::$key))
{ {
static::$user = $model::find(Session::get(static::$key)); static::$user = $model::find(Session::get(static::$key));
@ -70,11 +64,8 @@ public static function login($username, $password)
if ( ! is_null($user)) if ( ! is_null($user))
{ {
// ----------------------------------------------------- // If a salt is present on the user record, we will recreate the hashed password
// Hash the password. If a salt is present on the user // using the salt. Otherwise, we will just use a plain hash.
// record, we will recreate the hashed password using
// the salt. Otherwise, we will just use a plain hash.
// -----------------------------------------------------
$password = (isset($user->salt)) ? Hash::make($password, $user->salt)->value : sha1($password); $password = (isset($user->salt)) ? Hash::make($password, $user->salt)->value : sha1($password);
if ($user->password === $password) if ($user->password === $password)
@ -97,13 +88,7 @@ public static function login($username, $password)
*/ */
public static function logout() public static function logout()
{ {
// -----------------------------------------------------
// By removing the user ID from the session, the user
// will no longer be considered logged in on subsequent
// requests to the application.
// -----------------------------------------------------
Session::forget(static::$key); Session::forget(static::$key);
static::$user = null; static::$user = null;
} }