Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 15:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix request validation for preconfigured installs

Browse Source
This commit is contained in:
Joshua Dwire 2021-03-12 18:46:56 -05:00
parent a844afd128
commit 941132133c
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Requests/Setup/StoreSetupRequest.php
View File

@ -27,31 +27,38 @@ class StoreSetupRequest extends Request
public function rules() public function rules()
{ {
return [ $rules = [
/*System*/ /*System*/
'url' => 'required', 'url' => 'required',
/*Database*/ /*Mail driver*/
'db_host' => 'required', 'mail_driver' => 'required',
'db_database' => 'required', 'encryption' => 'required_unless:mail_driver,log',
'db_username' => 'required', 'mail_host' => 'required_unless:mail_driver,log',
'db_password' => '', 'mail_username' => 'required_unless:mail_driver,log',
/*Mail driver*/ 'mail_name' => 'required_unless:mail_driver,log',
'mail_driver' => 'required', 'mail_address' => 'required_unless:mail_driver,log',
'encryption' => 'required_unless:mail_driver,log', 'mail_password' => 'required_unless:mail_driver,log',
'mail_host' => 'required_unless:mail_driver,log', /*user registration*/
'mail_username' => 'required_unless:mail_driver,log', 'privacy_policy' => 'required',
'mail_name' => 'required_unless:mail_driver,log', 'terms_of_service' => 'required',
'mail_address' => 'required_unless:mail_driver,log', 'first_name' => 'required',
'mail_password' => 'required_unless:mail_driver,log', 'last_name' => 'required',
/*user registration*/ 'email' => 'required|email:rfc,dns',
'privacy_policy' => 'required', 'password' => 'required',
'terms_of_service' => 'required', ];
'first_name' => 'required',
'last_name' => 'required', if ( ! config( 'ninja.preconfigured_install' ) ) {
'email' => 'required|email:rfc,dns', $rules = array_merge( $rules, [
'password' => 'required', /*Database*/
]; 'db_host' => 'required',
} 'db_database' => 'required',
'db_username' => 'required',
'db_password' => '',
] );
}
return $rules;
}
protected function prepareForValidation() protected function prepareForValidation()
{ {