Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for loading tokens

Browse Source
This commit is contained in:
Hillel Coren 2016-05-08 10:05:16 +03:00
parent cf9dbae1d1
commit 89b5d73615
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Account.php
View File

@ -470,10 +470,10 @@ class Account extends Eloquent
return Document::getDirectFileUrl($this->logo, $this->getLogoDisk()); return Document::getDirectFileUrl($this->logo, $this->getLogoDisk());
} }
public function getToken($name) public function getToken($userId, $name)
{ {
foreach ($this->account_tokens as $token) { foreach ($this->account_tokens as $token) {
if ($token->name === $name) { if ($token->user_id == $userId && $token->name === $name) {
return $token->token; return $token->token;
} }
} }

2
app/Ninja/Transformers/UserAccountTransformer.php
View File

@ -32,7 +32,7 @@ class UserAccountTransformer extends EntityTransformer
return [ return [
'account_key' => $user->account->account_key, 'account_key' => $user->account->account_key,
'name' => $user->account->present()->name, 'name' => $user->account->present()->name,
'token' => $user->account->getToken($this->tokenName), 'token' => $user->account->getToken($user->id, $this->tokenName),
'default_url' => SITE_URL 'default_url' => SITE_URL
]; ];
} }