StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More service structure testing and configuration

Browse source 
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
This commit is contained in:
Dane Everitt 2017-06-24 19:49:09 -05:00
parent ce2b2447d0
commit 2235481765
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
18 changed files with 755 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Requests/Admin/LocationRequest.php
View file

@ -35,6 +35,10 @@ class LocationRequest extends AdminFormRequest
*/
public function rules()
{
return app()->make(Location::class)->getRules();
if ($this->method() === 'PATCH') {
return Location::getUpdateRulesForId($this->location->id);
}
return Location::getCreateRules();
}
}

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

@ -25,46 +25,19 @@
namespace Pterodactyl\Http\Requests\Admin;
use Pterodactyl\Models\User;
use Pterodactyl\Contracts\Repositories\UserInterface;
class UserFormRequest extends AdminFormRequest
{
/**
* {@inheritdoc}
*/
public function repository()
{
return UserInterface::class;
}
/**
* {@inheritdoc}
*/
public function rules()
{
if ($this->method() === 'PATCH') {
return [
'email' => 'required|email|unique:users,email,' . $this->user->id,
'username' => 'required|alpha_dash|between:1,255|unique:users,username, ' . $this->user->id . '|' . User::USERNAME_RULES,
'name_first' => 'required|string|between:1,255',
'name_last' => 'required|string|between:1,255',
'password' => 'sometimes|nullable|' . User::PASSWORD_RULES,
'root_admin' => 'required|boolean',
// 'language' => 'sometimes|required|string|min:1|max:5',
// 'use_totp' => 'sometimes|required|boolean',
// 'totp_secret' => 'sometimes|required|size:16',
];
return User::getUpdateRulesForId($this->user->id);
}
return [
'email' => 'required|email|unique:users,email',
'username' => 'required|alpha_dash|between:1,255|unique:users,username|' . User::USERNAME_RULES,
'name_first' => 'required|string|between:1,255',
'name_last' => 'required|string|between:1,255',
'password' => 'sometimes|nullable|' . User::PASSWORD_RULES,
'root_admin' => 'required|boolean',
'external_id' => 'sometimes|nullable|numeric|unique:users,external_id',
];
return User::getCreateRules();
}
public function normalize()