Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-06 15:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use more meaningful domain exceptions to represent ApiKeyService thrown errors

Browse Source
This commit is contained in:
Alejandro Celaya
2024-11-18 09:51:27 +01:00
parent b11d5c6864
commit 8298ef36f8
5 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module/Rest/src/Service/ApiKeyService.php
View File

@@ -10,6 +10,8 @@ use Shlinkio\Shlink\Core\Model\Renaming;
use Shlinkio\Shlink\Rest\ApiKey\Model\ApiKeyMeta;
use Shlinkio\Shlink\Rest\ApiKey\Repository\ApiKeyRepositoryInterface;
use Shlinkio\Shlink\Rest\Entity\ApiKey;
use Shlinkio\Shlink\Rest\Exception\ApiKeyConflictException;
use Shlinkio\Shlink\Rest\Exception\ApiKeyNotFoundException;
use function sprintf;
@@ -71,7 +73,12 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
*/
public function disableByName(string $apiKeyName): ApiKey
{
return $this->disableApiKey($this->repo->findOneBy(['name' => $apiKeyName]));
$apiKey = $this->repo->findOneBy(['name' => $apiKeyName]);
if ($apiKey === null) {
throw ApiKeyNotFoundException::forName($apiKeyName);
}
return $this->disableApiKey($apiKey);
}
/**
@@ -79,15 +86,16 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
*/
public function disableByKey(string $key): ApiKey
{
return $this->disableApiKey($this->findByKey($key));
}
private function disableApiKey(ApiKey|null $apiKey): ApiKey
{
$apiKey = $this->findByKey($key);
if ($apiKey === null) {
throw new InvalidArgumentException('Provided API key does not exist and can\'t be disabled');
throw ApiKeyNotFoundException::forKey($key);
}
return $this->disableApiKey($apiKey);
}
private function disableApiKey(ApiKey $apiKey): ApiKey
{
$apiKey->disable();
$this->em->flush();
@@ -110,9 +118,7 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
{
$apiKey = $this->repo->findOneBy(['name' => $apiKeyRenaming->oldName]);
if ($apiKey === null) {
throw new InvalidArgumentException(
sprintf('API key with name "%s" could not be found', $apiKeyRenaming->oldName),
);
throw ApiKeyNotFoundException::forName($apiKeyRenaming->oldName);
}
if (! $apiKeyRenaming->nameChanged()) {
@@ -121,9 +127,7 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
$this->em->wrapInTransaction(function () use ($apiKeyRenaming, $apiKey): void {
if ($this->repo->nameExists($apiKeyRenaming->newName)) {
throw new InvalidArgumentException(
sprintf('Another API key with name "%s" already exists', $apiKeyRenaming->newName),
);
throw ApiKeyConflictException::forName($apiKeyRenaming->newName);
}
$apiKey->name = $apiKeyRenaming->newName;