DONE: phone number verification, admin can add user employment; WIP: wire with onewaysms
This commit is contained in:
@@ -10,6 +10,7 @@ use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Laravel\Fortify\Contracts\CreatesNewUsers;
|
||||
use Modules\Auth\Entities\User;
|
||||
use Modules\Auth\Services\PhoneVerificationOtpService;
|
||||
use Modules\Role\Entities\Role;
|
||||
use Modules\User\Notifications\UserActivationNotification;
|
||||
use Exception;
|
||||
@@ -18,6 +19,10 @@ class CreateNewUser implements CreatesNewUsers
|
||||
{
|
||||
use PasswordValidationRules, NotifiesAdmins;
|
||||
|
||||
public function __construct(
|
||||
protected PhoneVerificationOtpService $phoneVerificationOtpService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Validate and create a newly registered user.
|
||||
*
|
||||
@@ -25,7 +30,9 @@ class CreateNewUser implements CreatesNewUsers
|
||||
*/
|
||||
public function create(array $input): User
|
||||
{
|
||||
Validator::make($input, [
|
||||
$phoneNumber = $this->phoneVerificationOtpService->normalizePhoneNumber($input['phone_number'] ?? '');
|
||||
|
||||
Validator::make(array_merge($input, ['phone_number' => $phoneNumber]), [
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => [
|
||||
'required',
|
||||
@@ -35,15 +42,32 @@ class CreateNewUser implements CreatesNewUsers
|
||||
Rule::unique(User::class),
|
||||
],
|
||||
'ic_number' => ['required', 'string', 'max:255'],
|
||||
'phone_number' => [
|
||||
...$this->phoneVerificationOtpService->phoneNumberRules(),
|
||||
Rule::unique(User::class),
|
||||
],
|
||||
'phone_verification_token' => ['required', 'string', 'size:64'],
|
||||
'password' => ['required', 'string', 'min:8'],
|
||||
], [
|
||||
'phone_number.required' => 'Nombor telefon diperlukan.',
|
||||
'phone_number.regex' => 'Format nombor telefon tidak sah.',
|
||||
'phone_number.unique' => 'Nombor telefon ini telah didaftarkan.',
|
||||
'phone_verification_token.required' => 'Pengesahan nombor telefon diperlukan.',
|
||||
])->validate();
|
||||
|
||||
$this->phoneVerificationOtpService->consumeRegistrationToken(
|
||||
$phoneNumber,
|
||||
$input['phone_verification_token'],
|
||||
);
|
||||
|
||||
$user = User::create([
|
||||
'name' => $input['name'],
|
||||
'uuid' => Str::uuid(),
|
||||
'email' => $input['email'],
|
||||
'password' => Hash::make($input['password']),
|
||||
'ic_number' => $input['ic_number'],
|
||||
'phone_number' => $phoneNumber,
|
||||
'phone_verified_at' => now(),
|
||||
'status' => 'pending',
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user