Work on reminder system.

taylorotwell · taylorotwell · commit 7e19c9dcad13 · 2013-11-14T17:28:40.000-06:00
diff --git a/src/Illuminate/Auth/Reminders/PasswordBroker.php b/src/Illuminate/Auth/Reminders/PasswordBroker.php
@@ -69,6 +69,13 @@ class PasswordBroker {
 	 */
 	protected $reminderView;
 
+	/**
+	 * The custom password validator callback.
+	 *
+	 * @var \Closure
+	 */
+	protected $passwordValidator;
+
 	/**
 	 * Create a new password broker instance.
 	 *
@@ -105,7 +112,7 @@ public function remind(array $credentials, Closure $callback = null)
 
 		if (is_null($user))
 		{
-			return self::USER_NOT_FOUND;
+			return self::INVALID_USER;
 		}
 
 		// Once we have the reminder token, we are ready to send a message out to the
@@ -182,7 +189,7 @@ protected function validateReset(array $credentials)
 	{
 		if (is_null($user = $this->getUser($credentials)))
 		{
-			return self::USER_NOT_FOUND;
+			return self::INVALID_USER;
 		}
 
 		if ( ! $this->validNewPasswords($credentials))
@@ -198,13 +205,42 @@ protected function validateReset(array $credentials)
 		return $user;
 	}
 
+	/**
+	 * Set a custom password validator.
+	 *
+	 * @param  \Closure  $callback
+	 * @return void
+	 */
+	public function validator(Closure $callback)
+	{
+		$this->passwordValidator = $callback;
+	}
+
 	/**
 	 * Determine if the passwords match for the request.
 	 *
 	 * @param  array  $credentials
 	 * @return bool
 	 */
 	protected function validNewPasswords(array $credentials)
+	{
+		if (isset($this->passwordValidator))
+		{
+			return call_user_func($this->passwordValidator, $credentials);
+		}
+		else
+		{
+			return $this->validatePasswordWithDefaults($credentials);
+		}
+	}
+
+	/**
+	 * Determine if the passwords are valid for the request.
+	 *
+	 * @param  array  $credentials
+	 * @return bool
+	 */
+	protected function validatePasswordWithDefaults(array $credentials)
 	{
 		list($password, $confirm) = array($credentials['password'], $credentials['password_confirmation']);
 
diff --git a/src/Illuminate/Support/Facades/Password.php b/src/Illuminate/Support/Facades/Password.php
@@ -2,6 +2,41 @@
 
 class Password extends Facade {
 
+	/**
+	 * Constant representing a successfully sent reminder.
+	 *
+	 * @var int
+	 */
+	const REMINDER_SENT = 1;
+
+	/**
+	 * Constant representing a successfully reset password.
+	 *
+	 * @var int
+	 */
+	const PASSWORD_RESET = 2;
+
+	/**
+	 * Constant representing the user not found response.
+	 *
+	 * @var int
+	 */
+	const INVALID_USER = 3;
+
+	/**
+	 * Constant representing an invalid password.
+	 *
+	 * @var int
+	 */
+	const INVALID_PASSWORD = 4;
+
+	/**
+	 * Constant representing an invalid token.
+	 *
+	 * @var int
+	 */
+	const INVALID_TOKEN = 5;
+
 	/**
 	 * Get the registered name of the component.
 	 *
