From 7a7e366da539d834279c1c9f1805bfbf8e9fe1ed Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 24 Nov 2014 14:25:44 -0600
Subject: [PATCH] Simplify validation on register stuff.

---
 app/Http/Controllers/Auth/AuthController.php | 21 +++++++++----
 app/Http/Requests/Auth/LoginRequest.php      | 29 ------------------
 app/Http/Requests/Auth/RegisterRequest.php   | 31 --------------------
 3 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 app/Http/Requests/Auth/LoginRequest.php
 delete mode 100644 app/Http/Requests/Auth/RegisterRequest.php

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 078757fe..6d66afdc 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -1,10 +1,9 @@
 <?php namespace App\Http\Controllers\Auth;
 
 use App\User;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
-use App\Http\Requests\Auth\LoginRequest;
-use App\Http\Requests\Auth\RegisterRequest;
 
 class AuthController extends Controller {
 
@@ -41,11 +40,17 @@ public function getRegister()
 	/**
 	 * Handle a registration request for the application.
 	 *
-	 * @param  RegisterRequest  $request
+	 * @param  Request  $request
 	 * @return Response
 	 */
-	public function postRegister(RegisterRequest $request)
+	public function postRegister(Request $request)
 	{
+		$this->validate($request, [
+			'name' => 'required|max:255',
+			'email' => 'required|email|max:255|unique:users',
+			'password' => 'required|min:6|confirmed',
+		]);
+
 		$user = User::forceCreate([
 			'name' => $request->name,
 			'email' => $request->email,
@@ -70,11 +75,15 @@ public function getLogin()
 	/**
 	 * Handle a login request to the application.
 	 *
-	 * @param  LoginRequest  $request
+	 * @param  Request  $request
 	 * @return Response
 	 */
-	public function postLogin(LoginRequest $request)
+	public function postLogin(Request $request)
 	{
+		$this->validate($request, [
+			'email' => 'required', 'password' => 'required'
+		]);
+
 		$credentials = $request->only('email', 'password');
 
 		if ($this->auth->attempt($credentials, $request->has('remember')))
diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php
deleted file mode 100644
index cbe42d3e..00000000
--- a/app/Http/Requests/Auth/LoginRequest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php namespace App\Http\Requests\Auth;
-
-use App\Http\Requests\Request;
-
-class LoginRequest extends Request {
-
-	/**
-	 * Get the validation rules that apply to the request.
-	 *
-	 * @return array
-	 */
-	public function rules()
-	{
-		return [
-			'email' => 'required', 'password' => 'required',
-		];
-	}
-
-	/**
-	 * Determine if the user is authorized to make this request.
-	 *
-	 * @return bool
-	 */
-	public function authorize()
-	{
-		return true;
-	}
-
-}
diff --git a/app/Http/Requests/Auth/RegisterRequest.php b/app/Http/Requests/Auth/RegisterRequest.php
deleted file mode 100644
index 29653231..00000000
--- a/app/Http/Requests/Auth/RegisterRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php namespace App\Http\Requests\Auth;
-
-use App\Http\Requests\Request;
-
-class RegisterRequest extends Request {
-
-	/**
-	 * Get the validation rules that apply to the request.
-	 *
-	 * @return array
-	 */
-	public function rules()
-	{
-		return [
-			'name' => 'required|max:255',
-			'email' => 'required|max:255|email|unique:users',
-			'password' => 'required|confirmed|min:8',
-		];
-	}
-
-	/**
-	 * Determine if the user is authorized to make this request.
-	 *
-	 * @return bool
-	 */
-	public function authorize()
-	{
-		return true;
-	}
-
-}