shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add customer/user's email validation

Browse Source
This commit is contained in:
Burak Çakırel 2021-04-29 15:19:05 +03:00
parent beaa84e380
commit 09f83c2044
No known key found for this signature in database
GPG Key ID: 48FFBB7771B99C7C
3 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Requests/Auth/User.php
View File

@ -2,10 +2,14 @@
namespace App\Http\Requests\Auth;
use App\Traits\Contacts;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class User extends FormRequest
{
use Contacts;
/**
* Determine if the user is authorized to make this request.
*
@ -29,12 +33,22 @@ class User extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
$email = ['required', 'email'];
if ($this->getMethod() == 'PATCH') {
// Updating user
$id = is_numeric($this->user) ? $this->user : $this->user->getAttribute('id');
$password = '';
$companies = $this->user->can('read-common-companies') ? 'required' : '';
$roles = $this->user->can('read-auth-roles') ? 'required' : '';
if ($this->user->contact) {
$email[] = Rule::unique('contacts')
->ignore($this->user->contact->id)
->where('company_id', company_id())
->where('type', $this->getCustomerTypes())
->where('deleted_at');
}
} else {
// Creating user
$id = null;
@ -43,9 +57,11 @@ class User extends FormRequest
$roles = 'required';
}
$email[] = Rule::unique('users')->ignore($id)->where('deleted_at');
return [
'name' => 'required|string',
'email' => 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL',
'email' => $email,
'password' => $password . 'confirmed',
'companies' => $companies,
'roles' => $roles,

16
app/Http/Requests/Common/Contact.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
use Illuminate\Validation\Rule;
class Contact extends FormRequest
{
@ -23,7 +24,7 @@ class Contact extends FormRequest
*/
public function rules()
{
$email = '';
$email = [];
$required = '';
$type = $this->request->get('type', 'customer');
@ -43,7 +44,18 @@ class Contact extends FormRequest
}
if (!empty($this->request->get('email'))) {
$email = 'email|unique:contacts,NULL,' . $id . ',id,company_id,' . $company_id . ',type,' . $type . ',deleted_at,NULL';
$email[] = 'email';
$email[] = Rule::unique('contacts')
->ignore($id)
->where('company_id', $company_id)
->where('type', $type)
->where('deleted_at');
if (isset($model) && $this->$model->user_id) {
$email[] = Rule::unique('users')
->ignore($this->$model->user_id)
->where('deleted_at');
}
}
return [

22
app/Http/Requests/Portal/Profile.php
View File

@ -2,10 +2,14 @@
namespace App\Http\Requests\Portal;
use App\Traits\Contacts;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class Profile extends FormRequest
{
use Contacts;
/**
* Determine if the user is authorized to make this request.
*
@ -31,9 +35,25 @@ class Profile extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
$email = [
'required',
'email',
Rule::unique('users')
->ignore($id)
->where('deleted_at'),
];
if (user()->contact) {
$email[] = Rule::unique('contacts')
->ignore(user()->contact->id)
->where('company_id', company_id())
->where('type', $this->getCustomerTypes())
->where('deleted_at');
}
return [
'name' => 'required|string',
'email' => 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL',
'email' => $email,
'password' => 'confirmed',
'picture' => $picture,
];