From 7fc28ba42bcf7205057bae697dfa2ab11052ee57 Mon Sep 17 00:00:00 2001
From: Zak Henry <zak.henry@gmail.com>
Date: Mon, 21 Sep 2015 17:22:01 +1000
Subject: [PATCH] Tidied user credentials updating now _user_profile has gone
 from usercontroller

---
 api/app/Http/Controllers/UserController.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/api/app/Http/Controllers/UserController.php b/api/app/Http/Controllers/UserController.php
index 9c6ea1e6..921c06d5 100644
--- a/api/app/Http/Controllers/UserController.php
+++ b/api/app/Http/Controllers/UserController.php
@@ -99,9 +99,6 @@ public function permissions(Request $request)
      */
     public function putOne(Request $request, $id)
     {
-        // Extract the credentials
-        $credential = $request->input('_user_credential', []);
-
         // Set new users to guest
         $request->merge(['user_type' => 'guest']);
 
@@ -118,8 +115,10 @@ public function putOne(Request $request, $id)
         $model->save();
 
         // Finally create the credentials
-        $this->validateRequest($credential, UserCredential::getValidationRules());
-        $model->setCredential(new UserCredential($credential));
+        if ($credential = $request->input('_user_credential', null)){
+            $this->validateRequest($credential, UserCredential::getValidationRules());
+            $model->setCredential(new UserCredential($credential));
+        }
 
         return $this->getResponse()
             ->transformer($this->getTransformer())
@@ -165,17 +164,16 @@ public function patchOne(Request $request, $id)
 
         /* @var \Tymon\JWTAuth\JWTAuth $jwtAuth */
         // Extract the credentials and update if necessary
-        $credentialUpdateDetails = $request->input('_user_credential', []);
-        if (! empty($credentialUpdateDetails)) {
+        $credentialUpdateDetails = $request->input('_user_credential');
+        if ($credentialUpdateDetails) {
             // Invalidate token for the user when user changes their password
             if ($this->jwtAuth->user()->user_id == $model->user_id) {
                 $token = $this->jwtAuth->getTokenFromRequest();
                 $this->jwtAuth->invalidate($token);
             }
 
-            $credentials = UserCredential::findOrNew($id);
             /* @var UserCredential $credentials */
-            $credentials->fill($credentialUpdateDetails);
+            $credentials = UserCredential::findOrNew($id)->fill($credentialUpdateDetails);
             $model->setCredential($credentials);
         }