From 09ccb88784f24a13b159abd30cecd5a806238769 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 2 Nov 2015 15:29:38 +1100
Subject: [PATCH] separate API logic

---
 app/Http/Controllers/Auth/AuthController.php | 33 ++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 14ef9cf8b446..00153b3b6caa 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -75,6 +75,12 @@ class AuthController extends Controller {
 
     public function postLoginWrapper(Request $request)
     {
+        /** If request is from API*/
+        if($request->api_secret)
+        {
+            return $this->postLoginWrapperAPI($request);
+        }
+
         $userId = Auth::check() ? Auth::user()->id : null;
         $user = User::where('email', '=', $request->input('email'))->first();
 
@@ -99,12 +105,7 @@ class AuthController extends Controller {
             }
             Session::put(SESSION_USER_ACCOUNTS, $users);
 
-            if ($request->create_token) {
-                if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) {
-                    return 'Invalid secret';
-                }
-                return $this->accountRepo->createToken($request->token_name);
-            }
+
         } elseif ($user) {
             $user->failed_logins = $user->failed_logins + 1;
             $user->save();
@@ -113,6 +114,26 @@ class AuthController extends Controller {
         return $response;
     }
 
+    private function postLoginWrapperAPI(Request $request)
+    {
+        /**Auth check*/
+
+        /**Success*/
+            /* send back user object along with account token if it exists,
+            create token only if it does not exist*/
+
+        /**Failure*/
+            /* return json with failure message */
+
+        if ($request->create_token) {
+            if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) {
+                return 'Invalid secret';
+            }
+            return $this->accountRepo->createToken($request->token_name);
+        }
+    }
+
+
     public function getLogoutWrapper()
     {
         if (Auth::check() && !Auth::user()->registered) {