Merge branch 'develop' into feature/server-mounts

app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php

@@ -21,7 +21,7 @@ class StoreNodeRequest extends ApplicationApiRequest
     /**
      * Validation rules to apply to this request.
      *
-     * @param null|array $rules
+     * @param array|null $rules
      * @return array
      */
     public function rules(array $rules = null): array

app/Http/Requests/Api/Client/Servers/Schedules/StoreScheduleRequest.php

@@ -21,7 +21,7 @@ class StoreScheduleRequest extends ViewScheduleRequest
     {
         return [
             'name' => 'required|string|min:1',
-            'is_active' => 'boolean',
+            'is_active' => 'filled|boolean',
             'minute' => 'required|string',
             'hour' => 'required|string',
             'day_of_month' => 'required|string',

app/Http/Requests/Api/Client/Servers/Schedules/StoreTaskRequest.php

@@ -25,7 +25,7 @@ class StoreTaskRequest extends ViewScheduleRequest
     {
         return [
             'action' => 'required|in:command,power,backup',
-            'payload' => 'required_unless:action,backup|string',
+            'payload' => 'required_unless:action,backup|string|nullable',
             'time_offset' => 'required|numeric|min:0|max:900',
             'sequence_id' => 'sometimes|required|numeric|min:1',
         ];

app/Http/Requests/Api/Client/Servers/SendCommandRequest.php

@@ -3,8 +3,9 @@
 namespace Pterodactyl\Http\Requests\Api\Client\Servers;
 
 use Pterodactyl\Models\Permission;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
 
-class SendCommandRequest extends GetServerRequest
+class SendCommandRequest extends ClientApiRequest
 {
     /**
      * Determine if the API user has permission to perform this action.

app/Http/Requests/Auth/LoginCheckpointRequest.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http\Requests\Auth;
 
+use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 
 class LoginCheckpointRequest extends FormRequest
@@ -25,7 +26,20 @@ class LoginCheckpointRequest extends FormRequest
     {
         return [
             'confirmation_token' => 'required|string',
-            'authentication_code' => 'required|numeric',
+            'authentication_code' => [
+                'nullable',
+                'numeric',
+                Rule::requiredIf(function () {
+                    return empty($this->input('recovery_token'));
+                }),
+            ],
+            'recovery_token' => [
+                'nullable',
+                'string',
+                Rule::requiredIf(function () {
+                    return empty($this->input('authentication_code'));
+                }),
+            ],
         ];
     }
 }