From 7d2cf9770b3533e1031b7d7d9f57e6e0cfcc8cc3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 21:54:31 +1100
Subject: [PATCH 01/30] fixing validation

---
 app/Http/Controllers/AccountApiController.php | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index 4ac5d99018f9..6b9ee78f04b1 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -34,26 +34,9 @@ class AccountApiController extends BaseAPIController
         $this->accountRepo = $accountRepo;
     }
 
-    public function register(Request $request)
+    public function register(RegisterRequest $request)
     {
-        $validator = Validator::make($request->all(), [
-            'email' => 'required|unique:users',
-            'first_name' => 'required',
-            'last_name' => 'required',
-            'password' => 'required',
-        ]);
-
-        if ($validator->fails()) {
-
-            foreach($validator->errors()->all() as $message)
-            {
-                return $this->errorResponse(['message'=>$message],400);
-            }
-
-
-        }
-
-
+        
         $account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);        
         $user = $account->users()->first();
         

From 94a73f92ad28012ae41aed5117519a6dccdb2846 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:39:20 +1100
Subject: [PATCH 02/30] re-working validation

---
 app/Http/Controllers/AccountApiController.php |  2 +-
 app/Http/Requests/RegisterRequest.php         | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index 6b9ee78f04b1..a4d0e8aa3ca7 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -36,7 +36,7 @@ class AccountApiController extends BaseAPIController
 
     public function register(RegisterRequest $request)
     {
-        
+
         $account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);        
         $user = $account->users()->first();
         
diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 8709d42cc0a0..1dae2709498c 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -3,6 +3,8 @@
 use Auth;
 use App\Http\Requests\Request;
 use Illuminate\Validation\Factory;
+use App\Libraries\Utils;
+use Response;
 
 class RegisterRequest extends Request
 {
@@ -32,4 +34,15 @@ class RegisterRequest extends Request
 
         return $rules;
     }
+
+    public function response(array $errors)
+    {
+        //return parent::response($errors); // TODO: Change the autogenerated stub
+
+        $error['error'] = $errors[0];
+        $error = json_encode($error, JSON_PRETTY_PRINT);
+        $headers = Utils::getApiHeaders();
+
+        return Response::make($error, 400, $headers);
+    }
 }

From 35dfe66de2d86c20432e4729f6db94bae5a84b87 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:41:08 +1100
Subject: [PATCH 03/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 1dae2709498c..608e15cd25f2 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -39,10 +39,12 @@ class RegisterRequest extends Request
     {
         //return parent::response($errors); // TODO: Change the autogenerated stub
 
-        $error['error'] = $errors[0];
-        $error = json_encode($error, JSON_PRETTY_PRINT);
-        $headers = Utils::getApiHeaders();
+        foreach($errors as $err) {
+            $error['error'] = $err;
+            $error = json_encode($error, JSON_PRETTY_PRINT);
+            $headers = Utils::getApiHeaders();
 
-        return Response::make($error, 400, $headers);
+            return Response::make($error, 400, $headers);
+        }
     }
 }

From c8a46f6bd9820cc3065b0b4563fc018d247d17fc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:46:59 +1100
Subject: [PATCH 04/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 608e15cd25f2..bf9f7b61f7a5 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -2,6 +2,7 @@
 
 use Auth;
 use App\Http\Requests\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Factory;
 use App\Libraries\Utils;
 use Response;
@@ -39,6 +40,8 @@ class RegisterRequest extends Request
     {
         //return parent::response($errors); // TODO: Change the autogenerated stub
 
+        Log::info($errors);
+        
         foreach($errors as $err) {
             $error['error'] = $err;
             $error = json_encode($error, JSON_PRETTY_PRINT);

From fd173889eba15e8c28fb3e6ddf7ddbf07045bbab Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:56:44 +1100
Subject: [PATCH 05/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index bf9f7b61f7a5..7a8a0f9329e6 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -38,16 +38,18 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        //return parent::response($errors); // TODO: Change the autogenerated stub
+        return parent::response($errors); // TODO: Change the autogenerated stub
 
         Log::info($errors);
-        
-        foreach($errors as $err) {
-            $error['error'] = $err;
-            $error = json_encode($error, JSON_PRETTY_PRINT);
-            $headers = Utils::getApiHeaders();
 
-            return Response::make($error, 400, $headers);
+        foreach($errors as $err) {
+            foreach ($err as $key => $value) {
+                $error['error'] = $value;
+                $error = json_encode($error, JSON_PRETTY_PRINT);
+                $headers = Utils::getApiHeaders();
+
+                return Response::make($error, 400, $headers);
+            }
         }
     }
 }

From b244f8034b0472bbf255163b7c1a03ce8a5d129c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:58:05 +1100
Subject: [PATCH 06/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 7a8a0f9329e6..338b9b923dab 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -38,7 +38,7 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        return parent::response($errors); // TODO: Change the autogenerated stub
+    //    return parent::response($errors); // TODO: Change the autogenerated stub
 
         Log::info($errors);
 

From 7c054c5e9b4c2a98bd95a952982cf8988fc7e649 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 22:59:01 +1100
Subject: [PATCH 07/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 338b9b923dab..3ecebb306c9d 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -44,6 +44,11 @@ class RegisterRequest extends Request
 
         foreach($errors as $err) {
             foreach ($err as $key => $value) {
+
+                Log::info($err);
+                Log::info($key);
+                Log::info($value);
+
                 $error['error'] = $value;
                 $error = json_encode($error, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();

From 4bc07aacbf9817c2d194967bb43f3d03f4ef5e2f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:02:07 +1100
Subject: [PATCH 08/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 3ecebb306c9d..9c2c1a1423f9 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -49,7 +49,7 @@ class RegisterRequest extends Request
                 Log::info($key);
                 Log::info($value);
 
-                $error['error'] = $value;
+                $error['error'] = ['message'=>$value];
                 $error = json_encode($error, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();
 

From 3d2daf9758977dbe6602f4600b0b4860f864a0a3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:04:27 +1100
Subject: [PATCH 09/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 9c2c1a1423f9..66dbe3914c3a 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -36,9 +36,12 @@ class RegisterRequest extends Request
         return $rules;
     }
 
-    public function response(array $errors)
+    public function response(Request $request, array $errors)
     {
-    //    return parent::response($errors); // TODO: Change the autogenerated stub
+       // TODO: Change the autogenerated stub
+
+        if(!isset($request->api_secret))
+            return parent::response($errors);
 
         Log::info($errors);
 

From 392024a0b923f733a037284102ceaab8c2919bd3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:06:26 +1100
Subject: [PATCH 10/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 66dbe3914c3a..a5808fc4ba54 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -14,6 +14,13 @@ class RegisterRequest extends Request
      *
      * @return bool
      */
+    public function __construct(array $query, array $request, array $attributes, array $cookies, array $files, array $server, $content)
+    {
+        parent::__construct($query, $request, $attributes, $cookies, $files, $server, $content);
+
+        $this->request = $request;
+    }
+
     public function authorize()
     {
         return true;
@@ -36,11 +43,10 @@ class RegisterRequest extends Request
         return $rules;
     }
 
-    public function response(Request $request, array $errors)
+    public function response(array $errors)
     {
-       // TODO: Change the autogenerated stub
 
-        if(!isset($request->api_secret))
+        if(!isset($this->request->api_secret))
             return parent::response($errors);
 
         Log::info($errors);

From 00aa0624b84ac903ac71501209bd793d597a0ead Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:08:31 +1100
Subject: [PATCH 11/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index a5808fc4ba54..bba475b87843 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -43,7 +43,7 @@ class RegisterRequest extends Request
         return $rules;
     }
 
-    public function response(array $errors)
+    public function response($errors)
     {
 
         if(!isset($this->request->api_secret))

From e36298cd35963951a67e4e3cba0f0df28e07d3f7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:09:11 +1100
Subject: [PATCH 12/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index bba475b87843..a5808fc4ba54 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -43,7 +43,7 @@ class RegisterRequest extends Request
         return $rules;
     }
 
-    public function response($errors)
+    public function response(array $errors)
     {
 
         if(!isset($this->request->api_secret))

From b843bf008d179f8186a4727d0ebdb2f4cd8c0fd1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:10:15 +1100
Subject: [PATCH 13/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index a5808fc4ba54..0a02e01bc756 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -16,8 +16,6 @@ class RegisterRequest extends Request
      */
     public function __construct(array $query, array $request, array $attributes, array $cookies, array $files, array $server, $content)
     {
-        parent::__construct($query, $request, $attributes, $cookies, $files, $server, $content);
-
         $this->request = $request;
     }
 

From f9853af70a5e4899ddefed7749116fb8b1b73eee Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:12:04 +1100
Subject: [PATCH 14/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 0a02e01bc756..a153396704b9 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -16,6 +16,12 @@ class RegisterRequest extends Request
      */
     public function __construct(array $query, array $request, array $attributes, array $cookies, array $files, array $server, $content)
     {
+        $this->query = $query;
+        $this->attributes = $attributes;
+        $this->cookies = $cookies;
+        $this->files = $files;
+        $this->server = $server;
+        $this->content = content;
         $this->request = $request;
     }
 

From 15838765ffc0b126f68958bd72469f60c3942f70 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:14:08 +1100
Subject: [PATCH 15/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index a153396704b9..19c3edade426 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -16,12 +16,7 @@ class RegisterRequest extends Request
      */
     public function __construct(array $query, array $request, array $attributes, array $cookies, array $files, array $server, $content)
     {
-        $this->query = $query;
-        $this->attributes = $attributes;
-        $this->cookies = $cookies;
-        $this->files = $files;
-        $this->server = $server;
-        $this->content = content;
+        parent::__construct($query, $request, $attributes, $cookies, $files, $server, $content);
         $this->request = $request;
     }
 
@@ -49,7 +44,6 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-
         if(!isset($this->request->api_secret))
             return parent::response($errors);
 

From d7b6426aee258b73794328a340f67793b21d29d2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:20:56 +1100
Subject: [PATCH 16/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 19c3edade426..edc29fd90e41 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -14,11 +14,6 @@ class RegisterRequest extends Request
      *
      * @return bool
      */
-    public function __construct(array $query, array $request, array $attributes, array $cookies, array $files, array $server, $content)
-    {
-        parent::__construct($query, $request, $attributes, $cookies, $files, $server, $content);
-        $this->request = $request;
-    }
 
     public function authorize()
     {
@@ -44,7 +39,9 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        if(!isset($this->request->api_secret))
+        $request = $this->getRequest();
+
+        if(!isset($request->api_secret))
             return parent::response($errors);
 
         Log::info($errors);
@@ -64,4 +61,9 @@ class RegisterRequest extends Request
             }
         }
     }
+
+    public function getRequest(\Illuminate\Http\Request $request)
+    {
+        return $request;
+    }
 }

From c79509d04f6eb0b944e8d9760c8550a23ebcfc5d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:27:20 +1100
Subject: [PATCH 17/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index edc29fd90e41..91bd54f7de42 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,6 +15,11 @@ class RegisterRequest extends Request
      * @return bool
      */
 
+    public function __construct(\Illuminate\Http\Request $request)
+    {
+        $this->request = $request;
+    }
+
     public function authorize()
     {
         return true;
@@ -39,9 +44,8 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        $request = $this->getRequest();
 
-        if(!isset($request->api_secret))
+        if(!isset($this->request->api_secret))
             return parent::response($errors);
 
         Log::info($errors);
@@ -62,8 +66,4 @@ class RegisterRequest extends Request
         }
     }
 
-    public function getRequest(\Illuminate\Http\Request $request)
-    {
-        return $request;
-    }
 }

From b83ba5c7dceb8a4940cd1273b718d6049606919b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:28:33 +1100
Subject: [PATCH 18/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 91bd54f7de42..c72e6ad09217 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -45,6 +45,8 @@ class RegisterRequest extends Request
     public function response(array $errors)
     {
 
+        Log::info($this->request);
+
         if(!isset($this->request->api_secret))
             return parent::response($errors);
 

From 584133734ea6169ff83b060a4779af2566d4f4ee Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:29:38 +1100
Subject: [PATCH 19/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index c72e6ad09217..d140839fd381 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -45,8 +45,9 @@ class RegisterRequest extends Request
     public function response(array $errors)
     {
 
-        Log::info($this->request);
-
+        Log::info($this->request->api_secret);
+        Log::info($this->request->email);
+        
         if(!isset($this->request->api_secret))
             return parent::response($errors);
 

From 3d104400aa22ac3642c22f48e8b8499fdba3d0ad Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:31:15 +1100
Subject: [PATCH 20/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index d140839fd381..dbde21b1ab68 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,7 +15,7 @@ class RegisterRequest extends Request
      * @return bool
      */
 
-    public function __construct(\Illuminate\Http\Request $request)
+    public function __construct(Request $request)
     {
         $this->request = $request;
     }
@@ -47,7 +47,7 @@ class RegisterRequest extends Request
 
         Log::info($this->request->api_secret);
         Log::info($this->request->email);
-        
+
         if(!isset($this->request->api_secret))
             return parent::response($errors);
 

From 13b425853eafe45680d82e0bcbaf5f10d702ff65 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:32:38 +1100
Subject: [PATCH 21/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index dbde21b1ab68..fa8200dfc429 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,10 +15,6 @@ class RegisterRequest extends Request
      * @return bool
      */
 
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
 
     public function authorize()
     {
@@ -44,9 +40,10 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
+        $request = $this->getRequest();
 
-        Log::info($this->request->api_secret);
-        Log::info($this->request->email);
+        Log::info($request->api_secret);
+        Log::info($request->email);
 
         if(!isset($this->request->api_secret))
             return parent::response($errors);
@@ -69,4 +66,10 @@ class RegisterRequest extends Request
         }
     }
 
+    public function getRequest(Request $request)
+    {
+        return $request;
+    }
+
+
 }

From 3279b26bef6557fce054767f9af07e50a5a8b3d8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:34:42 +1100
Subject: [PATCH 22/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index fa8200dfc429..d06cd62c5436 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,6 +15,10 @@ class RegisterRequest extends Request
      * @return bool
      */
 
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
 
     public function authorize()
     {
@@ -26,8 +30,10 @@ class RegisterRequest extends Request
      *
      * @return array
      */
-    public function rules()
+    public function rules(Request $request)
     {
+        $this->request = $request;
+
         $rules = [
             'email' => 'required|unique:users',
             'first_name' => 'required',
@@ -40,10 +46,9 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        $request = $this->getRequest();
 
-        Log::info($request->api_secret);
-        Log::info($request->email);
+        Log::info($this->request->api_secret);
+        Log::info($this->request->email);
 
         if(!isset($this->request->api_secret))
             return parent::response($errors);

From a2ce87490ba975db233519c2a2df09ed3b8ed70d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:37:37 +1100
Subject: [PATCH 23/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index d06cd62c5436..6da65cf32593 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,11 +15,6 @@ class RegisterRequest extends Request
      * @return bool
      */
 
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
     public function authorize()
     {
         return true;
@@ -32,7 +27,7 @@ class RegisterRequest extends Request
      */
     public function rules(Request $request)
     {
-        $this->request = $request;
+        $this->setRequest($request);
 
         $rules = [
             'email' => 'required|unique:users',
@@ -46,11 +41,12 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
+        $request = $this->getRequest();
 
-        Log::info($this->request->api_secret);
-        Log::info($this->request->email);
+        Log::info($request->api_secret);
+        Log::info($request->email);
 
-        if(!isset($this->request->api_secret))
+        if(!isset($request->api_secret))
             return parent::response($errors);
 
         Log::info($errors);
@@ -71,9 +67,16 @@ class RegisterRequest extends Request
         }
     }
 
-    public function getRequest(Request $request)
+
+
+    public function setRequest($request)
     {
-        return $request;
+        $this->request = $request;
+    }
+
+    public function getRequest()
+    {
+        return $this->request;
     }
 
 

From 499a1561b19c2a1f641279d7cbe79169fb8d68a8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:38:25 +1100
Subject: [PATCH 24/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 6da65cf32593..0d1ed7665986 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -1,7 +1,7 @@
 <?php namespace app\Http\Requests;
 
 use Auth;
-use App\Http\Requests\Request;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Factory;
 use App\Libraries\Utils;

From 66204e91f45e54d233c29edfd7b30f649979cfee Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:41:33 +1100
Subject: [PATCH 25/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 0d1ed7665986..550668a5dd78 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -15,6 +15,12 @@ class RegisterRequest extends Request
      * @return bool
      */
 
+    public function __contstruct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+
     public function authorize()
     {
         return true;
@@ -25,9 +31,8 @@ class RegisterRequest extends Request
      *
      * @return array
      */
-    public function rules(Request $request)
+    public function rules()
     {
-        $this->setRequest($request);
 
         $rules = [
             'email' => 'required|unique:users',
@@ -41,7 +46,7 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        $request = $this->getRequest();
+        $request = $this->request;
 
         Log::info($request->api_secret);
         Log::info($request->email);
@@ -69,15 +74,4 @@ class RegisterRequest extends Request
 
 
 
-    public function setRequest($request)
-    {
-        $this->request = $request;
-    }
-
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-
 }

From 2b77af5abeec8c14e27e08898f007014e039ec66 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:43:39 +1100
Subject: [PATCH 26/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 28 ++++-----------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 550668a5dd78..89be776dd5c5 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -14,13 +14,6 @@ class RegisterRequest extends Request
      *
      * @return bool
      */
-
-    public function __contstruct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-
     public function authorize()
     {
         return true;
@@ -46,25 +39,12 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        $request = $this->request;
 
-        Log::info($request->api_secret);
-        Log::info($request->email);
+        foreach($errors as $error) {
+            foreach ($error as $key => $value) {
 
-        if(!isset($request->api_secret))
-            return parent::response($errors);
-
-        Log::info($errors);
-
-        foreach($errors as $err) {
-            foreach ($err as $key => $value) {
-
-                Log::info($err);
-                Log::info($key);
-                Log::info($value);
-
-                $error['error'] = ['message'=>$value];
-                $error = json_encode($error, JSON_PRETTY_PRINT);
+                $message['error'] = ['message'=>$value];
+                $message = json_encode($message, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();
 
                 return Response::make($error, 400, $headers);

From ba3ca0dffc2a5bd63dd4f94738dfb23ba46257cd Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:46:51 +1100
Subject: [PATCH 27/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 42 +++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 89be776dd5c5..83d098165dc6 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -1,7 +1,8 @@
 <?php namespace app\Http\Requests;
 
 use Auth;
-use Illuminate\Http\Request;
+use App\Http\Requests\Request;
+use Illuminate\Http\Request as InputRequest;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Factory;
 use App\Libraries\Utils;
@@ -14,6 +15,14 @@ class RegisterRequest extends Request
      *
      * @return bool
      */
+
+    public function __construct(InputRequest $req)
+    {
+        $this->req = $req;
+
+    }
+
+
     public function authorize()
     {
         return true;
@@ -40,11 +49,23 @@ class RegisterRequest extends Request
     public function response(array $errors)
     {
 
-        foreach($errors as $error) {
-            foreach ($error as $key => $value) {
+        Log::info($this->req->api_secret);
+        Log::info($this->req->email);
 
-                $message['error'] = ['message'=>$value];
-                $message = json_encode($message, JSON_PRETTY_PRINT);
+        if(!isset($this->req->api_secret))
+            return parent::response($errors);
+
+        Log::info($errors);
+
+        foreach($errors as $err) {
+            foreach ($err as $key => $value) {
+
+                Log::info($err);
+                Log::info($key);
+                Log::info($value);
+
+                $error['error'] = ['message'=>$value];
+                $error = json_encode($error, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();
 
                 return Response::make($error, 400, $headers);
@@ -54,4 +75,15 @@ class RegisterRequest extends Request
 
 
 
+    public function setRequest($request)
+    {
+        $this->request = $request;
+    }
+
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+
 }

From 22f683152d67cd9ff347cf881afd4b12be6cbed6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:49:51 +1100
Subject: [PATCH 28/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 36 ++++++---------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 83d098165dc6..501f232082b0 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -19,7 +19,6 @@ class RegisterRequest extends Request
     public function __construct(InputRequest $req)
     {
         $this->req = $req;
-
     }
 
 
@@ -48,42 +47,21 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-
-        Log::info($this->req->api_secret);
-        Log::info($this->req->email);
-
+        /* If the user is not validating from a mobile app - pass through parent::response*/
         if(!isset($this->req->api_secret))
             return parent::response($errors);
 
-        Log::info($errors);
+        /* If the user is  validating from a mobile app - pass through first error string and return error*/
+        foreach($errors as $error) {
+            foreach ($error as $key => $value) {
 
-        foreach($errors as $err) {
-            foreach ($err as $key => $value) {
-
-                Log::info($err);
-                Log::info($key);
-                Log::info($value);
-
-                $error['error'] = ['message'=>$value];
-                $error = json_encode($error, JSON_PRETTY_PRINT);
+                $message['error'] = ['message'=>$value];
+                $message = json_encode($error, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();
 
-                return Response::make($error, 400, $headers);
+                return Response::make($message, 400, $headers);
             }
         }
     }
 
-
-
-    public function setRequest($request)
-    {
-        $this->request = $request;
-    }
-
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-
 }

From 8d7a9a2d2918f640900d62d0b3a85d710d9fb9b4 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:50:40 +1100
Subject: [PATCH 29/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 501f232082b0..60d046cb1851 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -56,7 +56,7 @@ class RegisterRequest extends Request
             foreach ($error as $key => $value) {
 
                 $message['error'] = ['message'=>$value];
-                $message = json_encode($error, JSON_PRETTY_PRINT);
+                $message = json_encode($message, JSON_PRETTY_PRINT);
                 $headers = Utils::getApiHeaders();
 
                 return Response::make($message, 400, $headers);

From d9346bfadf5109199e9ca4bbfc9cc9fd61c11e08 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Mar 2016 23:52:02 +1100
Subject: [PATCH 30/30] re-working validation

---
 app/Http/Requests/RegisterRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php
index 60d046cb1851..91a27556924c 100644
--- a/app/Http/Requests/RegisterRequest.php
+++ b/app/Http/Requests/RegisterRequest.php
@@ -47,11 +47,11 @@ class RegisterRequest extends Request
 
     public function response(array $errors)
     {
-        /* If the user is not validating from a mobile app - pass through parent::response*/
+        /* If the user is not validating from a mobile app - pass through parent::response */
         if(!isset($this->req->api_secret))
             return parent::response($errors);
 
-        /* If the user is  validating from a mobile app - pass through first error string and return error*/
+        /* If the user is validating from a mobile app - pass through first error string and return error */
         foreach($errors as $error) {
             foreach ($error as $key => $value) {