From 320dd41303b0e8fe1d0220e4e6068bbf16fbf589 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 7 Dec 2024 14:26:44 +0100 Subject: [PATCH] fix: api endpoint --- .../Api/ApplicationsController.php | 111 +++++++++--------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php index 614208c78..35ff2632d 100644 --- a/app/Http/Controllers/Api/ApplicationsController.php +++ b/app/Http/Controllers/Api/ApplicationsController.php @@ -70,7 +70,8 @@ class ApplicationsController extends Controller items: new OA\Items(ref: '#/components/schemas/Application') ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -180,8 +181,10 @@ class ApplicationsController extends Controller 'watch_paths' => ['type' => 'string', 'description' => 'The watch paths.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -284,8 +287,10 @@ class ApplicationsController extends Controller 'watch_paths' => ['type' => 'string', 'description' => 'The watch paths.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -388,8 +393,10 @@ class ApplicationsController extends Controller 'watch_paths' => ['type' => 'string', 'description' => 'The watch paths.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -476,8 +483,10 @@ class ApplicationsController extends Controller 'instant_deploy' => ['type' => 'boolean', 'description' => 'The flag to indicate if the application should be deployed instantly.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -561,8 +570,10 @@ class ApplicationsController extends Controller 'instant_deploy' => ['type' => 'boolean', 'description' => 'The flag to indicate if the application should be deployed instantly.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -612,8 +623,10 @@ class ApplicationsController extends Controller 'instant_deploy' => ['type' => 'boolean', 'description' => 'The flag to indicate if the application should be deployed instantly.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -1268,7 +1281,8 @@ class ApplicationsController extends Controller ref: '#/components/schemas/Application' ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -1340,7 +1354,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -1466,8 +1481,10 @@ class ApplicationsController extends Controller 'watch_paths' => ['type' => 'string', 'description' => 'The watch paths.'], 'use_build_server' => ['type' => 'boolean', 'nullable' => true, 'description' => 'Use build server.'], ], - )), - ]), + ) + ), + ] + ), responses: [ new OA\Response( response: 200, @@ -1482,7 +1499,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -1598,9 +1616,10 @@ class ApplicationsController extends Controller $errors = []; $fqdn = str($fqdn)->trim()->explode(',')->map(function ($domain) use (&$errors) { $domain = trim($domain); - if (filter_var($domain, FILTER_VALIDATE_URL) === false || !preg_match('/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}/', $domain)) { + if (filter_var($domain, FILTER_VALIDATE_URL) === false || ! preg_match('/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}/', $domain)) { $errors[] = 'Invalid domain: '.$domain; } + return $domain; }); if (count($errors) > 0) { @@ -1706,7 +1725,8 @@ class ApplicationsController extends Controller items: new OA\Items(ref: '#/components/schemas/EnvironmentVariable') ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -1812,7 +1832,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2000,7 +2021,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2181,7 +2203,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2330,7 +2353,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2422,9 +2446,11 @@ class ApplicationsController extends Controller properties: [ 'message' => ['type' => 'string', 'example' => 'Deployment request queued.', 'description' => 'Message.'], 'deployment_uuid' => ['type' => 'string', 'example' => 'doogksw', 'description' => 'UUID of the deployment.'], - ]) + ] + ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2510,7 +2536,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, ref: '#/components/responses/401', @@ -2584,7 +2611,8 @@ class ApplicationsController extends Controller ] ) ), - ]), + ] + ), new OA\Response( response: 401, @@ -2827,30 +2855,3 @@ class ApplicationsController extends Controller } } } - - $fqdn = str($fqdn)->replaceStart(',', '')->trim(); - $errors = []; - $fqdn = str($fqdn)->trim()->explode(',')->map(function ($domain) use (&$errors) { - if (filter_var($domain, FILTER_VALIDATE_URL) === false) { - $errors[] = 'Invalid domain: ' . $domain; - } - - return str($domain)->trim()->lower(); - }); - if (count($errors) > 0) { - return response()->json([ - 'message' => 'Validation failed.', - 'errors' => $errors, - ], 422); - } - if (checkIfDomainIsAlreadyUsed($fqdn, $teamId, $uuid)) { - return response()->json([ - 'message' => 'Validation failed.', - 'errors' => [ - 'domains' => 'One of the domain is already used.', - ], - ], 422); - } - } - } -}