mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 04:24:33 -04:00
Update email validation
This commit is contained in:
parent
71535c0e41
commit
b7292a0432
@ -353,8 +353,8 @@ class ProjectController extends BaseController
|
|||||||
$project->fill($request->all());
|
$project->fill($request->all());
|
||||||
$project->save();
|
$project->save();
|
||||||
|
|
||||||
if (array_key_exists('documents', $data)) {
|
if ($request->has('documents')) {
|
||||||
$this->saveDocuments($data['documents'], $project);
|
$this->saveDocuments($request->input('documents'), $project);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->itemResponse($project->fresh());
|
return $this->itemResponse($project->fresh());
|
||||||
|
@ -38,7 +38,7 @@ class CreateAccountRequest extends Request
|
|||||||
'first_name' => 'string|max:100',
|
'first_name' => 'string|max:100',
|
||||||
'last_name' => 'string:max:100',
|
'last_name' => 'string:max:100',
|
||||||
'password' => 'required|string|min:6',
|
'password' => 'required|string|min:6',
|
||||||
'email' => 'bail|required|email',
|
'email' => 'bail|required|email:rfc,dns',
|
||||||
'email' => new NewUniqueUserRule(),
|
'email' => new NewUniqueUserRule(),
|
||||||
'privacy_policy' => 'required',
|
'privacy_policy' => 'required',
|
||||||
'terms_of_service' => 'required',
|
'terms_of_service' => 'required',
|
||||||
|
@ -28,7 +28,7 @@ class RegisterRequest extends FormRequest
|
|||||||
'first_name' => ['required', 'string', 'max:255'],
|
'first_name' => ['required', 'string', 'max:255'],
|
||||||
'last_name' => ['required', 'string', 'max:255'],
|
'last_name' => ['required', 'string', 'max:255'],
|
||||||
'phone' => ['required', 'string', 'max:255'],
|
'phone' => ['required', 'string', 'max:255'],
|
||||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:client_contacts'],
|
'email' => ['required', 'string', 'email:rfc,dns', 'max:255', 'unique:client_contacts'],
|
||||||
'password' => ['required', 'string', 'min:6', 'confirmed'],
|
'password' => ['required', 'string', 'min:6', 'confirmed'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ class UpdateContactRequest extends Request
|
|||||||
return [
|
return [
|
||||||
'first_name' => 'required',
|
'first_name' => 'required',
|
||||||
'last_name' => 'required',
|
'last_name' => 'required',
|
||||||
'email' => 'required|email|unique:client_contacts,email,'.auth()->user()->id,
|
'email' => 'required|email:rfc,dns|unique:client_contacts,email,'.auth()->user()->id,
|
||||||
'password' => 'sometimes|nullable|min:6|confirmed',
|
'password' => 'sometimes|nullable|min:6|confirmed',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ class StoreSetupRequest extends Request
|
|||||||
'terms_of_service' => 'required',
|
'terms_of_service' => 'required',
|
||||||
'first_name' => 'required',
|
'first_name' => 'required',
|
||||||
'last_name' => 'required',
|
'last_name' => 'required',
|
||||||
'email' => 'required',
|
'email' => 'required|email:rfc,dns',
|
||||||
'password' => 'required',
|
'password' => 'required',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ class UpdateUserRequest extends Request
|
|||||||
$rules = [];
|
$rules = [];
|
||||||
|
|
||||||
if (isset($input['email'])) {
|
if (isset($input['email'])) {
|
||||||
$rules['email'] = ['sometimes', new UniqueUserRule($this->user, $input['email'])];
|
$rules['email'] = ['email:rfc,dns', 'sometimes', new UniqueUserRule($this->user, $input['email'])];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
|
@ -35,6 +35,7 @@ class SystemHealth
|
|||||||
'xml',
|
'xml',
|
||||||
'bcmath',
|
'bcmath',
|
||||||
'mysqlnd',
|
'mysqlnd',
|
||||||
|
//'intl', //todo double check whether we need this for email dns validation
|
||||||
];
|
];
|
||||||
|
|
||||||
private static $php_version = 7.3;
|
private static $php_version = 7.3;
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
class ProjectNumberColumn extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('projects', function($table){
|
||||||
|
$table->string('number')->nullable();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
}
|
@ -100,7 +100,7 @@ class RandomDataSeeder extends Seeder
|
|||||||
$account->save();
|
$account->save();
|
||||||
|
|
||||||
$user = User::factory()->create([
|
$user = User::factory()->create([
|
||||||
'email' => $faker->email,
|
'email' => $faker->freeEmail,
|
||||||
'account_id' => $account->id,
|
'account_id' => $account->id,
|
||||||
'confirmation_code' => $this->createDbHash(config('database.default')),
|
'confirmation_code' => $this->createDbHash(config('database.default')),
|
||||||
]);
|
]);
|
||||||
|
@ -143,7 +143,7 @@ class FactoryCreationTest extends TestCase
|
|||||||
public function testUserCreate()
|
public function testUserCreate()
|
||||||
{
|
{
|
||||||
$new_user = UserFactory::create($this->account->id);
|
$new_user = UserFactory::create($this->account->id);
|
||||||
$new_user->email = $this->faker->email;
|
$new_user->email = $this->faker->freeEmail;
|
||||||
$new_user->save();
|
$new_user->save();
|
||||||
|
|
||||||
$this->assertNotNull($new_user);
|
$this->assertNotNull($new_user);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user