mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Working on the API
This commit is contained in:
parent
8abdc4a43f
commit
ffab252436
@ -48,15 +48,9 @@ class AccountApiController extends BaseAPIController
|
||||
{
|
||||
// Create a new token only if one does not already exist
|
||||
$this->accountRepo->createTokens(Auth::user(), $request->token_name);
|
||||
|
||||
return $this->index();
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
|
||||
$users = $this->accountRepo->findUsers(Auth::user(), 'account.account_tokens');
|
||||
|
||||
$resource = new Collection($users, new UserAccountTransformer);
|
||||
$resource = new Collection($users, new UserAccountTransformer($request->token_name));
|
||||
|
||||
return $this->returnData($resource);
|
||||
}
|
||||
|
@ -225,6 +225,17 @@ class Account extends Eloquent
|
||||
return file_exists($fileName.'.png') ? $fileName.'.png' : $fileName.'.jpg';
|
||||
}
|
||||
|
||||
public function getToken($name)
|
||||
{
|
||||
foreach ($this->account_tokens as $token) {
|
||||
if ($token->name === $name) {
|
||||
return $token->token;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public function getLogoWidth()
|
||||
{
|
||||
$path = $this->getLogoPath();
|
||||
|
@ -6,17 +6,11 @@ use League\Fractal\TransformerAbstract;
|
||||
|
||||
class UserAccountTransformer extends TransformerAbstract
|
||||
{
|
||||
protected $defaultIncludes = [
|
||||
'account_tokens'
|
||||
];
|
||||
protected $tokenName;
|
||||
|
||||
public function includeAccountTokens($user)
|
||||
public function __construct($tokenName)
|
||||
{
|
||||
$tokens = $user->account->account_tokens->filter(function($token) use ($user) {
|
||||
return $token->user_id === $user->id;
|
||||
});
|
||||
|
||||
return $this->collection($tokens, new AccountTokenTransformer);
|
||||
$this->tokenName = $tokenName;
|
||||
}
|
||||
|
||||
public function transform(User $user)
|
||||
@ -24,6 +18,7 @@ class UserAccountTransformer extends TransformerAbstract
|
||||
return [
|
||||
'account_key' => $user->account->account_key,
|
||||
'name' => $user->account->name,
|
||||
'token' => $user->account->getToken($this->tokenName),
|
||||
'user' => [
|
||||
'first_name' => $user->first_name,
|
||||
'last_name' => $user->last_name,
|
||||
|
Loading…
x
Reference in New Issue
Block a user