Browse Source

Finishing up auth re-write.

Taylor Otwell 12 years ago
parent
commit
60ab0b66e7

+ 17 - 51
application/config/auth.php

@@ -4,78 +4,44 @@ return array(
 
 
 	/*
 	/*
 	|--------------------------------------------------------------------------
 	|--------------------------------------------------------------------------
-	| 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.
-	|
-	*/
-
-	'attempt' => function($username, $password)
-	{
-		$user = DB::table('users')->where_username($username)->first();
-
-		if ( ! is_null($user) and Hash::check($password, $user->password))
-		{
-			return $user;
-		}
-	},
-
-	/*
-	|--------------------------------------------------------------------------
-	| Logout The Current User
-	|--------------------------------------------------------------------------
-	|
-	| 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 "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.
 	|
 	|
 	*/
 	*/
 
 
-	'logout' => function($user) {},
+	'model' => 'User',
 
 
 	/*
 	/*
 	|--------------------------------------------------------------------------
 	|--------------------------------------------------------------------------
-	| "Remember Me" Cookie Name
+	| Authentication Table
 	|--------------------------------------------------------------------------
 	|--------------------------------------------------------------------------
 	|
 	|
-	| 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.
+	| 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.
 	|
 	|
 	*/
 	*/
 
 
-	'cookie' => 'laravel_remember',
+	'table' => 'users',
 
 
 );
 );

+ 1 - 1
application/config/session.php

@@ -16,7 +16,7 @@ return array(
 	|
 	|
 	*/
 	*/
 
 
-	'driver' => '',
+	'driver' => 'cookie',
 
 
 	/*
 	/*
 	|--------------------------------------------------------------------------
 	|--------------------------------------------------------------------------

+ 1 - 1
application/routes.php

@@ -19,7 +19,7 @@
 |
 |
 | You can even respond to more than one URI:
 | You can even respond to more than one URI:
 |
 |
-|		Route::post('hello, world', function()
+|		Route::post(array('hello', 'world'), function()
 |		{
 |		{
 |			return 'Hello World!';
 |			return 'Hello World!';
 |		});
 |		});

+ 0 - 10
laravel/auth.php

@@ -60,16 +60,6 @@ class Auth {
 		}
 		}
 	}
 	}
 
 
-	/**
-	 * 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.
 	 * Register a third-party authentication driver.
 	 *
 	 *

+ 2 - 1
laravel/auth/drivers/driver.php

@@ -2,6 +2,7 @@
 
 
 use Laravel\Str;
 use Laravel\Str;
 use Laravel\Cookie;
 use Laravel\Cookie;
+use Laravel\Config;
 use Laravel\Session;
 use Laravel\Session;
 
 
 abstract class Driver {
 abstract class Driver {
@@ -184,7 +185,7 @@ abstract class Driver {
 
 
 		extract($config);
 		extract($config);
 
 
-		Cookie::put($name, $minutes, $token, $path, $domain, $secure);
+		Cookie::put($name, $minutes, $value, $path, $domain, $secure);
 	}
 	}
 
 
 	/**
 	/**