mirror of
https://github.com/shlinkio/shlink.git
synced 2026-03-07 07:43:12 +08:00
Split spec to join ApiKey spec with short URLs, into inlined and regular versions
This commit is contained in:
@@ -11,11 +11,8 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
|
||||
|
||||
class WithApiKeySpecsEnsuringJoin extends BaseSpecification
|
||||
{
|
||||
public function __construct(
|
||||
private ?ApiKey $apiKey,
|
||||
private string $fieldToJoin = 'shortUrls',
|
||||
private bool $inlined = false,
|
||||
) {
|
||||
public function __construct(private ?ApiKey $apiKey, private string $fieldToJoin = 'shortUrls')
|
||||
{
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -23,7 +20,7 @@ class WithApiKeySpecsEnsuringJoin extends BaseSpecification
|
||||
{
|
||||
return $this->apiKey === null || $this->apiKey->isAdmin() ? Spec::andX() : Spec::andX(
|
||||
Spec::join($this->fieldToJoin, 's'),
|
||||
$this->inlined ? $this->apiKey->inlinedSpec() : $this->apiKey->spec($this->fieldToJoin),
|
||||
$this->apiKey->spec($this->fieldToJoin),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user