2.x

app/Actions/Server/CreateServer.php

@@ -5,7 +5,6 @@
 use App\Enums\FirewallRuleStatus;
 use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
-use App\Exceptions\ServerProviderError;
 use App\Facades\Notifier;
 use App\Models\Server;
 use App\Models\User;
@@ -16,10 +15,8 @@
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
-use Illuminate\Validation\ValidationException;
 use Throwable;
 
 class CreateServer
@@ -29,8 +26,6 @@ class CreateServer
      */
     public function create(User $creator, array $input): Server
     {
-        $this->validateInputs($input);
-
         $server = new Server([
             'project_id' => $creator->currentProject->id,
             'user_id' => $creator->id,
@@ -56,12 +51,8 @@ public function create(User $creator, array $input): Server
                 $server->provider_id = $input['server_provider'];
             }
 
-            // validate type
-            $this->validateType($server, $input);
             $server->type_data = $server->type()->data($input);
 
-            // validate provider
-            $this->validateProvider($server, $input);
             $server->provider_data = $server->provider()->data($input);
 
             // save
@@ -85,11 +76,6 @@ public function create(User $creator, array $input): Server
         } catch (Exception $e) {
             $server->provider()->delete();
             DB::rollBack();
-            if ($e instanceof ServerProviderError) {
-                throw ValidationException::withMessages([
-                    'provider' => __('Provider Error: ').$e->getMessage(),
-                ]);
-            }
             throw $e;
         }
     }
@@ -126,59 +112,82 @@ function () use ($server) {
         $bus->onConnection('ssh')->dispatch();
     }
 
-    /**
-     * @throws ValidationException
-     */
-    private function validateInputs(array $input): void
+    public static function rules(array $input): array
     {
         $rules = [
-            'provider' => 'required|in:'.implode(',', config('core.server_providers')),
-            'name' => 'required',
-            'os' => 'required|in:'.implode(',', config('core.operating_systems')),
+            'provider' => [
+                'required',
+                Rule::in(config('core.server_providers')),
+            ],
+            'name' => [
+                'required',
+            ],
+            'os' => [
+                'required',
+                Rule::in(config('core.operating_systems')),
+            ],
             'type' => [
                 'required',
                 Rule::in(config('core.server_types')),
             ],
+            'server_provider' => [
+                Rule::when(function () use ($input) {
+                    return $input['provider'] != ServerProvider::CUSTOM;
+                }, [
+                    'required',
+                    'exists:server_providers,id,user_id,'.auth()->user()->id,
+                ]),
+            ],
+            'ip' => [
+                Rule::when(function () use ($input) {
+                    return $input['provider'] == ServerProvider::CUSTOM;
+                }, [
+                    'required',
+                    new RestrictedIPAddressesRule,
+                ]),
+            ],
+            'port' => [
+                Rule::when(function () use ($input) {
+                    return $input['provider'] == ServerProvider::CUSTOM;
+                }, [
+                    'required',
+                    'numeric',
+                    'min:1',
+                    'max:65535',
+                ]),
+            ],
         ];
 
-        Validator::make($input, $rules)->validate();
-
-        if ($input['provider'] != 'custom') {
-            $rules['server_provider'] = 'required|exists:server_providers,id,user_id,'.auth()->user()->id;
-        }
-
-        if ($input['provider'] == 'custom') {
-            $rules['ip'] = [
-                'required',
-                new RestrictedIPAddressesRule(),
-            ];
-            $rules['port'] = [
-                'required',
-                'numeric',
-                'min:1',
-                'max:65535',
-            ];
-        }
-
-        Validator::make($input, $rules)->validate();
+        return array_merge($rules, self::typeRules($input), self::providerRules($input));
     }
 
-    /**
-     * @throws ValidationException
-     */
-    private function validateType(Server $server, array $input): void
+    private static function typeRules(array $input): array
     {
-        Validator::make($input, $server->type()->createRules($input))
-            ->validate();
+        if (! isset($input['type']) || ! in_array($input['type'], config('core.server_types'))) {
+            return [];
+        }
+
+        $server = new Server(['type' => $input['type']]);
+
+        return $server->type()->createRules($input);
     }
 
-    /**
-     * @throws ValidationException
-     */
-    private function validateProvider(Server $server, array $input): void
+    private static function providerRules(array $input): array
     {
-        Validator::make($input, $server->provider()->createRules($input))
-            ->validate();
+        if (
+            ! isset($input['provider']) ||
+            ! in_array($input['provider'], config('core.server_providers')) ||
+            $input['provider'] == ServerProvider::CUSTOM
+        ) {
+            return [];
+        }
+
+        $server = new Server([
+            'provider' => $input['provider'],
+            'provider_id' => $input['server_provider'],
+        ]);
+
+        return $server->provider()->createRules($input);
     }
 
     private function createFirewallRules(Server $server): void