Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 22:44:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for client request validation

Browse Source
This commit is contained in:
David Bomba 2021-09-13 08:42:15 +10:00
parent f168895507
commit 1356b3d7ad
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/ContactKeyLogin.php
View File

@ -41,6 +41,10 @@ class ContactKeyLogin
if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) { if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {
$payload = Cache::get($request->segment(3)); $payload = Cache::get($request->segment(3));
if(!$payload)
abort(403, 'Link expired.');
$contact_email = $payload['email']; $contact_email = $payload['email'];
if($client_contact = ClientContact::where('email', $contact_email)->where('company_id', $payload['company_id'])->first()){ if($client_contact = ClientContact::where('email', $contact_email)->where('company_id', $payload['company_id'])->first()){

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

@ -74,7 +74,6 @@ class StoreClientRequest extends Request
$rules['number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)]; $rules['number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
$rules['id_number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)]; $rules['id_number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
return $rules; return $rules;
} }

5
app/Http/Requests/Request.php
View File

@ -136,6 +136,10 @@ class Request extends FormRequest
if (isset($input['contacts']) && is_array($input['contacts'])) { if (isset($input['contacts']) && is_array($input['contacts'])) {
foreach ($input['contacts'] as $key => $contact) { foreach ($input['contacts'] as $key => $contact) {
if(!is_array($contact))
continue;
if (array_key_exists('id', $contact) && is_numeric($contact['id'])) { if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
unset($input['contacts'][$key]['id']); unset($input['contacts'][$key]['id']);
} elseif (array_key_exists('id', $contact) && is_string($contact['id'])) { } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
@ -154,6 +158,7 @@ class Request extends FormRequest
} }
} }
} }
} }
} }