Should wrap up the base landing page stuff for accounts, next step is server rendering
This commit is contained in:
parent
67ac36f5ce
commit
e045ef443a
32 changed files with 1223 additions and 317 deletions
85
app/Http/Requests/Base/AccountDataFormRequest.php
Normal file
85
app/Http/Requests/Base/AccountDataFormRequest.php
Normal file
|
@ -0,0 +1,85 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace Pterodactyl\Http\Requests\Base;
|
||||
|
||||
use Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException;
|
||||
use Pterodactyl\Models\User;
|
||||
use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
||||
|
||||
class AccountDataFormRequest extends FrontendUserFormRequest
|
||||
{
|
||||
/**
|
||||
* @return bool
|
||||
* @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
if (! parent::authorize()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Verify password matches when changing password or email.
|
||||
if (in_array($this->input('do_action'), ['password', 'email'])) {
|
||||
if (! password_verify($this->input('current_password'), $this->user()->password)) {
|
||||
throw new InvalidPasswordProvidedException(trans('base.account.invalid_password'));
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
$modelRules = User::getUpdateRulesForId($this->user()->id);
|
||||
|
||||
switch ($this->input('do_action')) {
|
||||
case 'email':
|
||||
$rules = [
|
||||
'new_email' => array_get($modelRules, 'email'),
|
||||
];
|
||||
break;
|
||||
case 'password':
|
||||
$rules = [
|
||||
'new_password' => 'required|confirmed|string|min:8',
|
||||
'new_password_confirmation' => 'required',
|
||||
];
|
||||
break;
|
||||
case 'identity':
|
||||
$rules = [
|
||||
'name_first' => array_get($modelRules, 'name_first'),
|
||||
'name_last' => array_get($modelRules, 'name_last'),
|
||||
'username' => array_get($modelRules, 'username'),
|
||||
];
|
||||
break;
|
||||
default:
|
||||
abort(422);
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
|
@ -22,11 +22,12 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace Pterodactyl\Http\Requests;
|
||||
namespace Pterodactyl\Http\Requests\Base;
|
||||
|
||||
use IPTools\Network;
|
||||
use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
||||
|
||||
class ApiKeyRequest extends BaseFormRequest
|
||||
class ApiKeyFormRequest extends FrontendUserFormRequest
|
||||
{
|
||||
/**
|
||||
* Rules applied to data passed in this request.
|
||||
|
@ -58,7 +59,7 @@ class ApiKeyRequest extends BaseFormRequest
|
|||
}
|
||||
}
|
||||
|
||||
$this->merge(['allowed_ips' => $loop], $this->except('allowed_ips'));
|
||||
$this->merge(['allowed_ips' => $loop]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -69,12 +70,11 @@ class ApiKeyRequest extends BaseFormRequest
|
|||
public function withValidator($validator)
|
||||
{
|
||||
$validator->after(function ($validator) {
|
||||
/* @var \Illuminate\Validation\Validator $validator */
|
||||
if (empty($this->input('permissions')) && empty($this->input('admin_permissions'))) {
|
||||
$validator->errors()->add('permissions', 'At least one permission must be selected.');
|
||||
}
|
||||
});
|
||||
|
||||
$validator->after(function ($validator) {
|
||||
foreach ($this->input('allowed_ips') as $ip) {
|
||||
$ip = trim($ip);
|
||||
|
|
@ -26,8 +26,10 @@ namespace Pterodactyl\Http\Requests;
|
|||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class BaseFormRequest extends FormRequest
|
||||
abstract class FrontendUserFormRequest extends FormRequest
|
||||
{
|
||||
abstract public function rules();
|
||||
|
||||
/**
|
||||
* Determine if a user is authorized to access this endpoint.
|
||||
*
|
Reference in a new issue