Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove CORS from middleware (#3064)

Browse Source 
* Remove headers

* Unique emails per client

* fixes for company name

* remove cors from middleware
This commit is contained in:
David Bomba 2019-11-13 17:18:24 +11:00 committed by GitHub
parent 12dc613b9b
commit 0354b58f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Kernel.php
View File

@ -53,7 +53,6 @@ class Kernel extends HttpKernel
'throttle:60,1',
'bindings',
'query_logging',
'cors',
\App\Http\Middleware\StartupCheck::class,
],
'contact' => [

10
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -17,6 +17,7 @@ use App\Http\ValidationRules\ValidSettingsRule;
use App\Models\Client;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\Log;
use Illuminate\Validation\Rule;
class StoreClientRequest extends Request
{
@ -43,15 +44,18 @@ class StoreClientRequest extends Request
//$rules['name'] = 'required|min:1';
$rules['id_number'] = 'unique:clients,id_number,' . $this->id . ',id,company_id,' . $this->company_id;
$rules['settings'] = new ValidSettingsRule();
$contacts = request('contacts');
if(is_array($contacts))
{
for ($i = 0; $i < count($contacts); $i++) {
//$rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . isset($contacts[$i]['id']);
$rules['contacts.' . $i . '.email'] = 'nullable|email';
// $rules['contacts.' . $i . '.email'] = Rule::unique('client_contacts','email')->where(function ($query) {
// return $query->where('company_id', $this->company_id);
// });
//$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,NULL,' . isset($contacts[$i]['id']).',company_id,'.$this->company_id;
$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,client_id,'.$this->id;
}
}

4
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -54,8 +54,8 @@ class UpdateClientRequest extends Request
if(is_array($contacts))
{
for ($i = 0; $i < count($contacts); $i++) {
//$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . $contacts[$i]['id'];
$rules['contacts.' . $i . '.email'] = 'nullable|email';
$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . isset($contacts[$i]['id'].',company_id,'.$this->company_id);
//$rules['contacts.' . $i . '.email'] = 'nullable|email';
}
}
return $rules;

2
app/Jobs/Company/CreateCompany.php
View File

@ -51,7 +51,7 @@ class CreateCompany
{
$settings = CompanySettings::defaults();
$default_company_name = isset($this->request['first_name']) ?: '' . ' ' . isset($this->request['last_name']) ?: '';
$default_company_name = isset($this->request['first_name']) ? $this->request['first_name'] : '' . ' ' . isset($this->request['last_name']) ? $this->request['last_name'] : '';
$settings->name = isset($this->request['name']) ? $this->request['name'] : $default_company_name;

4
routes/api.php
View File

@ -25,14 +25,14 @@ Route::group(['middleware' => ['api_secret_check']], function () {
});
Route::group(['api_secret_check','domain_db','cors'], function () {
Route::group(['api_secret_check','domain_db'], function () {
Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.reset');
});
Route::group(['middleware' => ['api_db','api_secret_check','token_auth','cors'], 'prefix' =>'api/v1', 'as' => 'api.'], function () {
Route::group(['middleware' => ['api_db','api_secret_check','token_auth'], 'prefix' =>'api/v1', 'as' => 'api.'], function () {
Route::resource('activities', 'ActivityController'); // name = (clients. index / create / show / update / destroy / edit