Sms verification ok

This commit is contained in:
2023-12-02 13:36:50 +05:00
parent d6fd71e0dd
commit d9ea58608b
25 changed files with 692 additions and 169 deletions

51
app/Helpers/helpers.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
use App\Models\System\Verification;
use Illuminate\Http\Client\Client;
use Illuminate\Support\Facades\Log;
/**
* Send a sms
*
* @return void
*/
function sendSMS(string|int $phone, string|int $message)
{
$client = new Client();
$headers = [
'Content-Type' => 'application/json;charset=utf-8;',
'Charset' => 'UTF-8'
];
$body = '{
"SendRequest": {
"TerminalID": "Online_PANEL",
"Version": "1",
"Lang": "EN",
"MobilePhone": "993'.$phone.'",
"Text": "'. $message .'"
}
}';
$request = new Request('POST', 'http://10.3.158.103:8080/kpsmsroute/online.request', $headers, $body);
try {
$res = $client->sendAsync($request, $options)->wait();
return $res->getBody();
} catch (\Exception $e) {
Log::error($e);
}
}
/**
* Send a sms verification code
*/
function sendSMSVerification(string|int $phone_number): ?Verification
{
$phone_code = rand(10000, 99999);
$verification = Verification::where(['username' => $phone_number])->first();
$verification ? $verification->update(['code' => $phone_code]) : Verification::create(['username' => $phone_number, 'code' => $phone_code]);
sendSMS($phone_number, 'Tassyklaýyş belgi: '.$phone_code);
return $verification;
}

View File

@@ -0,0 +1,121 @@
<?php
namespace App\Http\Controllers\Auth;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
use Laravel\Nova\Nova;
class LoginController extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications.
|
*/
use AuthenticatesUsers, ValidatesRequests;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('nova.guest:'.config('nova.guard'))->except('logout');
}
/**
* Show the application's login form.
*
* @return \Inertia\Response|\Symfony\Component\HttpFoundation\Response
*/
public function showLoginForm()
{
return view('vendor.nova.pages.login');
}
/**
* The user has been authenticated.
*
* @param mixed $user
* @return mixed
*/
protected function authenticated(Request $request, $user)
{
$redirect = redirect()->intended($this->redirectPath());
return $request->wantsJson()
? new JsonResponse([
'redirect' => $redirect->getTargetUrl(),
], 200)
: $redirect;
}
/**
* Log the user out of the application.
*
* @return \Illuminate\Http\RedirectResponse
*/
public function logout(Request $request)
{
$this->guard()->logout();
$request->session()->invalidate();
return redirect()->intended($this->redirectPath());
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return Nova::url(Nova::$initialPath);
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard(config('nova.guard'));
}
/**
* Get the login username to be used by the controller.
*/
public function username(): string
{
return 'username';
}
/**
* Validate the user login request.
*
* @return void
*
* @throws \Illuminate\Validation\ValidationException
*/
protected function validateLogin(Request $request)
{
$request->validate([
$this->username() => ['required', 'string', 'max:250', 'exists:users,username'],
'password' => ['required', 'string', 'max:250'],
]);
}
}

View File

@@ -0,0 +1,107 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Auth\Events\Registered;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
/**
* Show registration page
*/
public function showNovaRegisterpageForm(): View
{
return view('vendor.nova.pages.register');
}
/**
* Handle a registration request for the application.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
*/
public function register(Request $request)
{
$this->middleware('guest');
$this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all())));
Auth::guard()->login($user);
sendSMSVerification($user->phone);
return to_route('sms-verification');
}
/**
* Get a validator for an incoming registration request.
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
$data['phone'] = substr(str_replace(['+', '(', ')', '-', '_'], '', $data['phone']), 3);
return Validator::make($data, [
'name' => ['required', 'string', 'max:255'],
'phone' => ['required', 'integer', 'between:61000000,671999999', 'unique:users,phone'],
'username' => ['required', 'string', 'alpha_dash:ascii', 'max:255', 'unique:users,username'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
]);
}
/**
* Create a new user instance after a valid registration.
*
* @return \App\Models\User
*/
protected function create(array $data)
{
$user = User::create([
'name' => $data['name'],
'phone' => $data['phone'],
'username' => $data['username'],
'password' => Hash::make($data['password']),
'active' => true,
]);
return $user;
}
/**
* Sms verification
*/
public function smsVerification()
{
return view('vendor.nova.pages.sms-verification');
}
/**
* Verify sms code
*/
public function verifySmsCode()
{
}
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Models\System;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Verification extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'username',
'code',
];
}

View File

@@ -24,10 +24,14 @@ class User extends Authenticatable
* @var array<int, string>
*/
protected $fillable = [
'username',
'name',
'email',
'phone',
'email_verified_at',
'password',
'locale',
'active',
];
/**

View File

@@ -26,7 +26,6 @@ class StatusFilter extends Filter
/**
* Apply the filter to the given query.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @param \Illuminate\Database\Eloquent\Builder $query
* @param mixed $value
* @return \Illuminate\Database\Eloquent\Builder
@@ -38,9 +37,6 @@ class StatusFilter extends Filter
/**
* Get the filter's available options.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function options(NovaRequest $request): array
{

View File

@@ -5,7 +5,6 @@ namespace App\Nova\Resources\Order\Loan;
use App\Models\Branch\Branch;
use App\Models\Order\Loan\LoanOrder as LoanOrderModel;
use App\Models\System\Location\Province;
use App\Nova\Filters\ActiveFilter;
use App\Nova\Filters\RegionFilter;
use App\Nova\Filters\StatusFilter;
use App\Nova\Resource;

View File

@@ -4,6 +4,7 @@ namespace App\Nova;
use App\Nova\Resources\Branch\Branch;
use App\Nova\Resources\System\Roles\Role;
use App\Rules\OnlyLetters;
use Illuminate\Http\Request;
use Illuminate\Validation\Rules;
use Laravel\Nova\Fields\BelongsToMany;
@@ -12,6 +13,8 @@ use Laravel\Nova\Fields\MorphToMany;
use Laravel\Nova\Fields\Password;
use Laravel\Nova\Fields\Text;
use Laravel\Nova\Http\Requests\NovaRequest;
use Nurmuhammet\NovaInputmask\NovaInputmask;
use Trin4ik\NovaSwitcher\NovaSwitcher;
class User extends Resource
{
@@ -76,24 +79,42 @@ class User extends Resource
return [
ID::make()->sortable(),
Text::make('Name')
Text::make(__('Username'), 'username')
->sortable()
->rules('required', 'string', new OnlyLetters(), 'max:250')
->creationRules('unique:users,username')
->updateRules('unique:users,username,{{resourceId}}'),
Text::make(__('Name'), 'name')
->sortable()
->rules('required', 'max:255'),
Text::make('Email')
NovaInputmask::make(__('Phone'), 'phone')
->mask('+(\\9\\93)-99-99-99-99')
->storeRawValue()
->size('w-1/4')
->rules('required', 'integer', 'between:61000000, 71999999'),
Text::make(__('Email'), 'email')
->sortable()
->rules('required', 'email', 'max:254')
->creationRules('unique:users,email')
->updateRules('unique:users,email,{{resourceId}}'),
Password::make('Password')
Password::make(__('Password'), 'password')
->onlyOnForms()
->creationRules('required', Rules\Password::defaults())
->updateRules('nullable', Rules\Password::defaults()),
MorphToMany::make(__('Roles'), 'roles', Role::class),
NovaSwitcher::make(__('Active'), 'active')
->default(true)
->canSeeWhen('isAdmin', $this),
BelongsToMany::make(__('Branches'), 'branches', Branch::class),
MorphToMany::make(__('Roles'), 'roles', Role::class)
->canSeeWhen('isAdmin', $this),
BelongsToMany::make(__('Branches'), 'branches', Branch::class)
->canSeeWhen('isAdmin', $this),
];
}

View File

@@ -17,7 +17,7 @@ class RouteServiceProvider extends ServiceProvider
*
* @var string
*/
public const HOME = '/home';
public const HOME = '/';
/**
* Define your route model bindings, pattern filters, and other route configuration.