tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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());
}
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;
}
}

2
app/Ninja/Repositories/AccountRepository.php
View file

@ -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;

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

@ -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
];
}