From 89b5d73615166dc9e018c86e6f898214291f850e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 8 May 2016 10:05:16 +0300
Subject: [PATCH] Fix for loading tokens

---
 app/Models/Account.php                            | 4 ++--
 app/Ninja/Repositories/AccountRepository.php      | 2 +-
 app/Ninja/Transformers/UserAccountTransformer.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 952dd97cec5d..6bceb23d8f92 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -470,10 +470,10 @@ class Account extends Eloquent
         return Document::getDirectFileUrl($this->logo, $this->getLogoDisk());
     }
 
-    public function getToken($name)
+    public function getToken($userId, $name)
     {
         foreach ($this->account_tokens as $token) {
-            if ($token->name === $name) {
+            if ($token->user_id == $userId && $token->name === $name) {
                 return $token->token;
             }
         }
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 3b3c36d3ecc3..f5d401619ee1 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -644,7 +644,7 @@ class AccountRepository
     {
         $name = trim($name) ?: 'TOKEN';
         $users = $this->findUsers($user);
-
+        
         foreach ($users as $user) {
             if ($token = AccountToken::whereUserId($user->id)->whereName($name)->first()) {
                 continue;
diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php
index bc49a96c546a..e914a25c663d 100644
--- a/app/Ninja/Transformers/UserAccountTransformer.php
+++ b/app/Ninja/Transformers/UserAccountTransformer.php
@@ -32,7 +32,7 @@ class UserAccountTransformer extends EntityTransformer
         return [
             'account_key' => $user->account->account_key,
             'name' => $user->account->present()->name,
-            'token' => $user->account->getToken($this->tokenName),
+            'token' => $user->account->getToken($user->id, $this->tokenName),
             'default_url' => SITE_URL
         ];
     }