diff --git a/application/config/auth.php b/application/config/auth.php index d0137583..1f7a15f0 100644 --- a/application/config/auth.php +++ b/application/config/auth.php @@ -4,78 +4,44 @@ /* |-------------------------------------------------------------------------- - | Retrieve The Current User + | Default Authentication Driver |-------------------------------------------------------------------------- | - | This closure is called by the Auth class' "user" method when trying to - | retrieve a user by the ID that is stored in their session. If you find - | the user, just return the user object, but make sure it has an "id" - | property. If you can't find the user, just return null. + | Laravel uses a flexible driver-based system to handle authentication. + | You are free to register your own drivers using the Auth::extend + | method. Of course, a few great drivers are provided out of + | box to handle basic authentication simply and easily. | - | Of course, a simple and elegant authentication solution has already - | been provided for you using the query builder and hashing engine. - | We love making your life as easy as possible. + | Drivers: 'fluent', 'eloquent'. | */ - 'user' => function($id) - { - if (filter_var($id, FILTER_VALIDATE_INT) !== false) - { - return DB::table('users')->find($id); - } - }, + 'driver' => 'eloquent', /* |-------------------------------------------------------------------------- - | Authenticate User Credentials + | Authentication Model |-------------------------------------------------------------------------- | - | This closure is called by the Auth::attempt() method when attempting to - | authenticate a user that is logging into your application. It's like a - | super buff bouncer to your application. - | - | If the provided credentials are correct, simply return an object that - | represents the user being authenticated. As long as it has a property - | for the "id", any object will work. If the credentials are not valid, - | you don't meed to return anything. + | When using the "eloquent" authentication driver, you may specify the + | model that should be considered the "User" model. This model will + | be used to authenticate and load the users of your application. | */ - 'attempt' => function($username, $password) - { - $user = DB::table('users')->where_username($username)->first(); - - if ( ! is_null($user) and Hash::check($password, $user->password)) - { - return $user; - } - }, + 'model' => 'User', /* |-------------------------------------------------------------------------- - | Logout The Current User + | Authentication Table |-------------------------------------------------------------------------- | - | Here you may do anything that needs to be done when a user logs out of - | your application, such as call the logout method on a third-party API - | you are using for authentication or anything else you desire. + | When using the "fluent" authentication driver, the database table used + | to load users may be specified here. This table will be used in by + | the fluent query builder to authenticate and load your users. | */ - 'logout' => function($user) {}, - - /* - |-------------------------------------------------------------------------- - | "Remember Me" Cookie Name - |-------------------------------------------------------------------------- - | - | Here you may specify the cookie name that will be used for the cookie - | that serves as the "remember me" token. Of course, a sensible default - | has been set for you, so you probably don't need to change it. - | - */ - - 'cookie' => 'laravel_remember', + 'table' => 'users', ); \ No newline at end of file diff --git a/application/config/session.php b/application/config/session.php index 6a5af5a3..ea686f89 100644 --- a/application/config/session.php +++ b/application/config/session.php @@ -16,7 +16,7 @@ | */ - 'driver' => '', + 'driver' => 'cookie', /* |-------------------------------------------------------------------------- diff --git a/application/routes.php b/application/routes.php index 91d17aa9..4c984f94 100644 --- a/application/routes.php +++ b/application/routes.php @@ -19,7 +19,7 @@ | | You can even respond to more than one URI: | -| Route::post('hello, world', function() +| Route::post(array('hello', 'world'), function() | { | return 'Hello World!'; | }); diff --git a/laravel/auth.php b/laravel/auth.php index b084ae69..0230ac47 100644 --- a/laravel/auth.php +++ b/laravel/auth.php @@ -60,16 +60,6 @@ protected static function factory($driver) } } - /** - * Run the logout method on all active drivers. - * - * @return void - */ - public static function logout() - { - array_walk(static::$drivers, function($d) { $d->logout(); }); - } - /** * Register a third-party authentication driver. * diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php index 652f5205..9c3c791d 100644 --- a/laravel/auth/drivers/driver.php +++ b/laravel/auth/drivers/driver.php @@ -2,6 +2,7 @@ use Laravel\Str; use Laravel\Cookie; +use Laravel\Config; use Laravel\Session; abstract class Driver { @@ -184,7 +185,7 @@ protected function cookie($name, $value, $minutes) extract($config); - Cookie::put($name, $minutes, $token, $path, $domain, $secure); + Cookie::put($name, $minutes, $value, $path, $domain, $secure); } /**