refactoring auth class.
This commit is contained in:
parent
06cb63f502
commit
70e35fb3d7
|
|
@ -5,6 +5,8 @@ class Arr {
|
||||||
/**
|
/**
|
||||||
* Get an item from an array.
|
* Get an item from an array.
|
||||||
*
|
*
|
||||||
|
* If the specified key is null, the entire array will be returned.
|
||||||
|
*
|
||||||
* @param array $array
|
* @param array $array
|
||||||
* @param string $key
|
* @param string $key
|
||||||
* @param mixed $default
|
* @param mixed $default
|
||||||
|
|
|
||||||
|
|
@ -64,11 +64,7 @@ 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
|
if ($user->password === Hash::make($password, $user->salt)->value)
|
||||||
// using the salt. Otherwise, we will just use a plain hash.
|
|
||||||
$password = (isset($user->salt)) ? Hash::make($password, $user->salt)->value : sha1($password);
|
|
||||||
|
|
||||||
if ($user->password === $password)
|
|
||||||
{
|
{
|
||||||
static::$user = $user;
|
static::$user = $user;
|
||||||
|
|
||||||
|
|
@ -89,6 +85,7 @@ public static function login($username, $password)
|
||||||
public static function logout()
|
public static function logout()
|
||||||
{
|
{
|
||||||
Session::forget(static::$key);
|
Session::forget(static::$key);
|
||||||
|
|
||||||
static::$user = null;
|
static::$user = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue