From 6f320aa62475ba764642dc9d0decdb7e54d858d2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 3 Nov 2015 19:09:52 +1100
Subject: [PATCH] merge

---
 app/Http/Controllers/AccountApiController.php | 7 +------
 app/Ninja/Repositories/AccountRepository.php  | 2 +-
 app/Ninja/Transformers/AccountTransformer.php | 5 +++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index a32fe200862f..619d9652e98d 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -32,7 +32,6 @@ class AccountApiController extends Controller
 
         if (Auth::attempt(['email' => $request->email, 'password' => $request->password])) {
             return $this->processLogin($request);
-            //return $this->accountRepo->createToken($request->token_name);
         } else {
             return 'Invalid credentials';
         }
@@ -55,13 +54,9 @@ class AccountApiController extends Controller
 
     private function processLogin(Request $request)
     {
-        \Log::info('authed user = '.Auth::user()->email);
 
         //Create a new token only if one does not already exist
-        if(!AccountToken::where('user_id', '=', Auth::user()->id)->firstOrFail())
-        {
-            $account_token = $this->accountRepo->createToken($request->token_name);
-        }
+        $this->accountRepo->createToken('ios_api_token');
 
         $manager = new Manager();
         $manager->setSerializer(new ArraySerializer());
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 4ba1c66b48f4..a824315e14c4 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -462,7 +462,7 @@ class AccountRepository
         $name = trim($name) ?: 'TOKEN';
 
         if ($token = AccountToken::scope()->whereName($name)->first()) {
-            return $token->token;
+            return $token;
         }
 
         $token = AccountToken::createNew();
diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index 262a8a19607a..616b06dffdfd 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -1,6 +1,7 @@
 <?php namespace App\Ninja\Transformers;
 
 use App\Models\Account;
+use App\Models\AccountToken;
 use League\Fractal;
 use League\Fractal\TransformerAbstract;
 
@@ -13,9 +14,9 @@ class AccountTransformer extends TransformerAbstract
 
     public function includeAccountTokens($account)
     {
-        $account_tokens = $account->tokens;
+        $account_token = AccountToken::whereAccountId($account->id)->whereName('ios_api_token')->first();
 
-        return $this->collection($account_tokens, new AccountTokenTransformer);
+        return $this->collection($account_token, new AccountTokenTransformer);
 
     }
     public function includeUsers($account)