biondizzle/vstash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from biondizzle/codex/fix-authentication-check-logic

Browse Source 
Refactor auth checks
This commit is contained in:
biondizzle
2025-06-05 19:39:25 -04:00
committed by GitHub
parent 8d950cf042 409c9950de
commit fdaa7232a1
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Controller/ConsoleApiController.php
View File

@@ -30,8 +30,9 @@ class ConsoleApiController extends AbstractController
// Credentials Management // Credentials Management
public function credentials(Request $request): JsonResponse public function credentials(Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
if ($request->getMethod() === 'GET') { if ($request->getMethod() === 'GET') {
$credentials = $this->entityManager->getRepository(S3Credential::class)->findAll(); $credentials = $this->entityManager->getRepository(S3Credential::class)->findAll();
@@ -74,8 +75,9 @@ class ConsoleApiController extends AbstractController
public function credentialDetail(int $id, Request $request): JsonResponse public function credentialDetail(int $id, Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$credential = $this->entityManager->getRepository(S3Credential::class)->find($id); $credential = $this->entityManager->getRepository(S3Credential::class)->find($id);
@@ -129,8 +131,9 @@ class ConsoleApiController extends AbstractController
// Buckets Management // Buckets Management
public function buckets(Request $request): JsonResponse public function buckets(Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
if ($request->getMethod() === 'GET') { if ($request->getMethod() === 'GET') {
$buckets = $this->entityManager->getRepository(S3Bucket::class)->findAll(); $buckets = $this->entityManager->getRepository(S3Bucket::class)->findAll();
@@ -194,8 +197,9 @@ class ConsoleApiController extends AbstractController
public function bucketDetail(string $name, Request $request): JsonResponse public function bucketDetail(string $name, Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$bucket = $this->s3Service->findBucketByName($name); $bucket = $this->s3Service->findBucketByName($name);
@@ -244,8 +248,9 @@ class ConsoleApiController extends AbstractController
// Objects Management // Objects Management
public function objects(string $bucketName, Request $request): JsonResponse public function objects(string $bucketName, Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$bucket = $this->s3Service->findBucketByName($bucketName); $bucket = $this->s3Service->findBucketByName($bucketName);
@@ -293,8 +298,9 @@ class ConsoleApiController extends AbstractController
public function objectDetail(string $bucketName, string $objectKey, Request $request): JsonResponse public function objectDetail(string $bucketName, string $objectKey, Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$bucket = $this->s3Service->findBucketByName($bucketName); $bucket = $this->s3Service->findBucketByName($bucketName);
@@ -335,8 +341,9 @@ class ConsoleApiController extends AbstractController
// Multipart Uploads // Multipart Uploads
public function multipartUploads(string $bucketName, Request $request): JsonResponse public function multipartUploads(string $bucketName, Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$bucket = $this->s3Service->findBucketByName($bucketName); $bucket = $this->s3Service->findBucketByName($bucketName);
@@ -368,8 +375,9 @@ class ConsoleApiController extends AbstractController
// Presigned URLs // Presigned URLs
public function presignedUrls(Request $request): JsonResponse public function presignedUrls(Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
if ($request->getMethod() === 'GET') { if ($request->getMethod() === 'GET') {
$urls = $this->entityManager->getRepository(\App\Entity\S3PresignedUrl::class) $urls = $this->entityManager->getRepository(\App\Entity\S3PresignedUrl::class)
@@ -425,8 +433,9 @@ class ConsoleApiController extends AbstractController
// Statistics // Statistics
public function stats(Request $request): JsonResponse public function stats(Request $request): JsonResponse
{ {
if ($resp = $this->checkAuth($request)) { $authResp = $this->checkAuth($request);
return $resp; if ($authResp !== null) {
return $authResp;
} }
$credentialCount = $this->entityManager->getRepository(S3Credential::class)->count([]); $credentialCount = $this->entityManager->getRepository(S3Credential::class)->count([]);
$bucketCount = $this->entityManager->getRepository(S3Bucket::class)->count([]); $bucketCount = $this->entityManager->getRepository(S3Bucket::class)->count([]);