diff --git a/application/config/application.php b/application/config/application.php index 57b08295..9f597954 100755 --- a/application/config/application.php +++ b/application/config/application.php @@ -139,46 +139,47 @@ */ 'aliases' => array( - 'Auth' => 'Laravel\\Auth', - 'Asset' => 'Laravel\\Asset', - 'Autoloader' => 'Laravel\\Autoloader', - 'Blade' => 'Laravel\\Blade', - 'Bundle' => 'Laravel\\Bundle', - 'Cache' => 'Laravel\\Cache', - 'Config' => 'Laravel\\Config', - 'Controller' => 'Laravel\\Routing\\Controller', - 'Cookie' => 'Laravel\\Cookie', - 'Crypter' => 'Laravel\\Crypter', - 'DB' => 'Laravel\\Database', - 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', - 'Event' => 'Laravel\\Event', - 'File' => 'Laravel\\File', - 'Filter' => 'Laravel\\Routing\\Filter', - 'Form' => 'Laravel\\Form', - 'Hash' => 'Laravel\\Hash', - 'HTML' => 'Laravel\\HTML', - 'Input' => 'Laravel\\Input', - 'IoC' => 'Laravel\\IoC', - 'Lang' => 'Laravel\\Lang', - 'Log' => 'Laravel\\Log', - 'Memcached' => 'Laravel\\Memcached', - 'Paginator' => 'Laravel\\Paginator', - 'Profiler' => 'Laravel\\Profiling\\Profiler', - 'URL' => 'Laravel\\URL', - 'Redirect' => 'Laravel\\Redirect', - 'Redis' => 'Laravel\\Redis', - 'Request' => 'Laravel\\Request', - 'Response' => 'Laravel\\Response', - 'Route' => 'Laravel\\Routing\\Route', - 'Router' => 'Laravel\\Routing\\Router', - 'Schema' => 'Laravel\\Database\\Schema', - 'Section' => 'Laravel\\Section', - 'Session' => 'Laravel\\Session', - 'Str' => 'Laravel\\Str', - 'Task' => 'Laravel\\CLI\\Tasks\\Task', - 'URI' => 'Laravel\\URI', - 'Validator' => 'Laravel\\Validator', - 'View' => 'Laravel\\View', + 'Auth' => 'Laravel\\Auth', + 'Authenticator' => 'Laravel\\Auth\\Drivers\\Driver', + 'Asset' => 'Laravel\\Asset', + 'Autoloader' => 'Laravel\\Autoloader', + 'Blade' => 'Laravel\\Blade', + 'Bundle' => 'Laravel\\Bundle', + 'Cache' => 'Laravel\\Cache', + 'Config' => 'Laravel\\Config', + 'Controller' => 'Laravel\\Routing\\Controller', + 'Cookie' => 'Laravel\\Cookie', + 'Crypter' => 'Laravel\\Crypter', + 'DB' => 'Laravel\\Database', + 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', + 'Event' => 'Laravel\\Event', + 'File' => 'Laravel\\File', + 'Filter' => 'Laravel\\Routing\\Filter', + 'Form' => 'Laravel\\Form', + 'Hash' => 'Laravel\\Hash', + 'HTML' => 'Laravel\\HTML', + 'Input' => 'Laravel\\Input', + 'IoC' => 'Laravel\\IoC', + 'Lang' => 'Laravel\\Lang', + 'Log' => 'Laravel\\Log', + 'Memcached' => 'Laravel\\Memcached', + 'Paginator' => 'Laravel\\Paginator', + 'Profiler' => 'Laravel\\Profiling\\Profiler', + 'URL' => 'Laravel\\URL', + 'Redirect' => 'Laravel\\Redirect', + 'Redis' => 'Laravel\\Redis', + 'Request' => 'Laravel\\Request', + 'Response' => 'Laravel\\Response', + 'Route' => 'Laravel\\Routing\\Route', + 'Router' => 'Laravel\\Routing\\Router', + 'Schema' => 'Laravel\\Database\\Schema', + 'Section' => 'Laravel\\Section', + 'Session' => 'Laravel\\Session', + 'Str' => 'Laravel\\Str', + 'Task' => 'Laravel\\CLI\\Tasks\\Task', + 'URI' => 'Laravel\\URI', + 'Validator' => 'Laravel\\Validator', + 'View' => 'Laravel\\View', ), ); diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php index 4a272ba4..6fdc92f7 100644 --- a/laravel/auth/drivers/driver.php +++ b/laravel/auth/drivers/driver.php @@ -5,6 +5,7 @@ use Laravel\Config; use Laravel\Session; use Laravel\Crypter; +use Laravel\Database\Eloquent\Model as Eloquent; abstract class Driver { diff --git a/laravel/auth/drivers/eloquent.php b/laravel/auth/drivers/eloquent.php index 5c0437d6..410de34e 100644 --- a/laravel/auth/drivers/eloquent.php +++ b/laravel/auth/drivers/eloquent.php @@ -15,7 +15,30 @@ public function retrieve($id) if (filter_var($id, FILTER_VALIDATE_INT) !== false) { return $this->model()->find($id); - } + } + } + + /** + * Login the user assigned to the given token. + * + * The token is typically a numeric ID for the user. + * + * @param mixed $token + * @param bool $remember + * @return bool + */ + public function login($token, $remember = false) + { + // if the token is an Eloquent model get the primary key + if ($token instanceof \Eloquent) $token = $token->get_key(); + + $this->token = $token; + + $this->store($token); + + if ($remember) $this->remember($token); + + return true; } /** diff --git a/laravel/cookie.php b/laravel/cookie.php index 88967407..1f79a69b 100644 --- a/laravel/cookie.php +++ b/laravel/cookie.php @@ -44,7 +44,7 @@ public static function has($name) */ public static function get($name, $default = null) { - if (isset(static::$jar[$name])) return static::$jar[$name]; + if (isset(static::$jar[$name])) return static::$jar[$name]['value']; return array_get(Request::foundation()->cookies->all(), $name, $default); }