Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[L6] Update even more areas of codebase using custom model validation logic

Browse source
This commit is contained in:
Dane Everitt 2019-09-04 22:26:28 -07:00
parent c586157dc4
commit 0d6cf54314
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
23 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php
View file

@ -15,7 +15,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
*/
public function rules()
{
$modelRules = ApiKey::getCreateRules();
$modelRules = ApiKey::getRules();
return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];

4
app/Http/Requests/Admin/DatabaseHostFormRequest.php
View file

@ -12,10 +12,10 @@ class DatabaseHostFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() !== 'POST') {
return DatabaseHost::getUpdateRulesForId($this->route()->parameter('host'));
return DatabaseHost::getRulesForUpdate($this->route()->parameter('host'));
}
return DatabaseHost::getCreateRules();
return DatabaseHost::getRules();
}
/**

4
app/Http/Requests/Admin/LocationFormRequest.php
View file

@ -21,9 +21,9 @@ class LocationFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Location::getUpdateRulesForId($this->route()->parameter('location')->id);
return Location::getRulesForUpdate($this->route()->parameter('location')->id);
}
return Location::getCreateRules();
return Location::getRules();
}
}

4
app/Http/Requests/Admin/Node/NodeFormRequest.php
View file

@ -20,10 +20,10 @@ class NodeFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Node::getUpdateRulesForId($this->route()->parameter('node')->id);
return Node::getRulesForUpdate($this->route()->parameter('node'));
}
return Node::getCreateRules();
return Node::getRules();
}
/**

4
app/Http/Requests/Admin/PackFormRequest.php
View file

@ -20,10 +20,10 @@ class PackFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Pack::getUpdateRulesForId($this->route()->parameter('pack')->id);
return Pack::getRulesForUpdate($this->route()->parameter('pack')->id);
}
return Pack::getCreateRules();
return Pack::getRules();
}
/**

2
app/Http/Requests/Admin/ServerFormRequest.php
View file

@ -21,7 +21,7 @@ class ServerFormRequest extends AdminFormRequest
*/
public function rules()
{
$rules = Server::getCreateRules();
$rules = Server::getRules();
$rules['description'][] = 'nullable';
return $rules;

4
app/Http/Requests/Admin/UserFormRequest.php
View file

@ -12,9 +12,9 @@ class UserFormRequest extends AdminFormRequest
*/
public function rules()
{
$rules = collect(User::getCreateRules());
$rules = collect(User::getRules());
if ($this->method() === 'PATCH') {
$rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([
$rules = collect(User::getRulesForUpdate($this->route()->parameter('user')))->merge([
'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],
]);
}

2
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View file

@ -25,7 +25,7 @@ class StoreLocationRequest extends ApplicationApiRequest
*/
public function rules(): array
{
return collect(Location::getCreateRules())->only([
return collect(Location::getRules())->only([
'long',
'short',
])->toArray();

2
app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php
View file

@ -27,7 +27,7 @@ class UpdateLocationRequest extends StoreLocationRequest
{
$locationId = $this->route()->parameter('location')->id;
return collect(Location::getUpdateRulesForId($locationId))->only([
return collect(Location::getRulesForUpdate($locationId))->only([
'short',
'long',
])->toArray();

2
app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
View file

@ -26,7 +26,7 @@ class StoreNodeRequest extends ApplicationApiRequest
*/
public function rules(array $rules = null): array
{
return collect($rules ?? Node::getCreateRules())->only([
return collect($rules ?? Node::getRules())->only([
'public',
'name',
'location_id',

2
app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
View file

@ -17,6 +17,6 @@ class UpdateNodeRequest extends StoreNodeRequest
{
$nodeId = $this->getModel(Node::class)->id;
return parent::rules(Node::getUpdateRulesForId($nodeId));
return parent::rules(Node::getRulesForUpdate($nodeId));
}
}

2
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View file

@ -28,7 +28,7 @@ class StoreServerRequest extends ApplicationApiRequest
*/
public function rules(): array
{
$rules = Server::getCreateRules();
$rules = Server::getRules();
return [
'external_id' => $rules['external_id'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View file

@ -14,7 +14,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
*/
public function rules(): array
{
$rules = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
$rules = Server::getRulesForUpdate($this->getModel(Server::class));
return [
'allocation' => $rules['allocation_id'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerDetailsRequest.php
View file

@ -13,7 +13,7 @@ class UpdateServerDetailsRequest extends ServerWriteRequest
*/
public function rules(): array
{
$rules = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
$rules = Server::getRulesForUpdate($this->getModel(Server::class));
return [
'external_id' => $rules['external_id'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php
View file

@ -25,7 +25,7 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
*/
public function rules(): array
{
$data = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
$data = Server::getRulesForUpdate($this->getModel(Server::class));
return [
'startup' => $data['startup'],

2
app/Http/Requests/Api/Application/Users/StoreUserRequest.php
View file

@ -26,7 +26,7 @@ class StoreUserRequest extends ApplicationApiRequest
*/
public function rules(array $rules = null): array
{
$rules = $rules ?? User::getCreateRules();
$rules = $rules ?? User::getRules();
$response = collect($rules)->only([
'external_id',

2
app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
View file

@ -16,6 +16,6 @@ class UpdateUserRequest extends StoreUserRequest
{
$userId = $this->getModel(User::class)->id;
return parent::rules(User::getUpdateRulesForId($userId));
return parent::rules(User::getRulesForUpdate($userId));
}
}

2
app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
View file

@ -32,7 +32,7 @@ class UpdateEmailRequest extends ClientApiRequest
*/
public function rules(): array
{
$rules = User::getUpdateRulesForId($this->user()->id);
$rules = User::getRulesForUpdate($this->user());
return ['email' => $rules['email']];
}

2
app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
View file

@ -32,7 +32,7 @@ class UpdatePasswordRequest extends ClientApiRequest
*/
public function rules(): array
{
$rules = User::getUpdateRulesForId($this->user()->id);
$rules = User::getRulesForUpdate($this->user());
return ['password' => array_merge($rules['password'], ['confirmed'])];
}

2
app/Http/Requests/Base/AccountDataFormRequest.php
View file

@ -40,7 +40,7 @@ class AccountDataFormRequest extends FrontendUserFormRequest
*/
public function rules()
{
$modelRules = User::getUpdateRulesForId($this->user()->id);
$modelRules = User::getRulesForUpdate($this->user());
switch ($this->input('do_action')) {
case 'email':

2
app/Http/Requests/Server/Settings/ChangeServerNameRequest.php
View file

@ -25,7 +25,7 @@ class ChangeServerNameRequest extends ServerFormRequest
public function rules()
{
return [
'name' => Server::getCreateRules()['name'],
'name' => Server::getRules()['name'],
];
}
}

4
app/Models/User.php
View file

@ -144,8 +144,10 @@ class User extends Validable implements
* Implement language verification by overriding Eloquence's gather
* rules function.
*/
protected static function gatherRules()
public static function getRules()
{
$rules = self::getRules();
$rules['language'][] = new In(array_keys((new self)->getAvailableLanguages()));
$rules['username'][] = new Username;

18
app/Models/Validable.php
View file

@ -79,14 +79,24 @@ abstract class Validable extends Model
}
/**
* Returns the rules associated with this model.
*
* @return array
*/
public static function getRules()
{
return static::$validationRules;
$rules = static::$validationRules;
foreach ($rules as $key => &$rule) {
$rule = is_array($rule) ? $rule : explode('|', $rule);
}
return $rules;
}
/**
* Returns the rules associated with the model, specifically for updating the given model
* rather than just creating it.
*
* @param \Illuminate\Database\Eloquent\Model|int|string $id
* @param string $primaryKey
* @return array
@ -98,17 +108,13 @@ abstract class Validable extends Model
}
$rules = static::getRules();
foreach ($rules as $key => &$rule) {
$rule = is_array($rule) ? $rule : explode('|', $rule);
}
foreach ($rules as $key => &$data) {
// For each rule in a given field, iterate over it and confirm if the rule
// is one for a unique field. If that is the case, append the ID of the current
// working model so we don't run into errors due to the way that field validation
// works.
foreach ($data as &$datum) {
if (! Str::startsWith($datum, 'unique')) {
if (! is_string($datum) || ! Str::startsWith($datum, 'unique')) {
continue;
}