From 0ebc002ea5b6ee90602ec777b5967df20f62d555 Mon Sep 17 00:00:00 2001 From: Mohammad Hafijul Islam Date: Sun, 1 Oct 2023 05:56:33 +0600 Subject: [PATCH 1/3] auth route version tag removed --- routes/api.php | 72 ++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/routes/api.php b/routes/api.php index cd18c5c..1d92acc 100644 --- a/routes/api.php +++ b/routes/api.php @@ -19,42 +19,40 @@ | */ -Route::prefix('v1')->group(function () { - Route::prefix('auth')->group(function () { - Route::post('/register', [RegisteredUserController::class, 'store']) - ->middleware('guest') - ->name('register'); - - Route::post('/login', [AuthenticatedSessionController::class, 'store']) - ->middleware('guest') - ->name('login'); - - Route::post('/forgot-password', [PasswordResetLinkController::class, 'store']) - ->middleware('guest') - ->name('password.email'); - - Route::post('/reset-password', [NewPasswordController::class, 'store']) - ->middleware('guest') - ->name('password.store'); - - Route::get('/verify-email/{id}/{hash}', VerifyEmailController::class) - ->middleware(['auth', 'signed', 'throttle:6,1']) - ->name('verification.verify'); - - Route::post('/email/verification-notification', [EmailVerificationNotificationController::class, 'store']) - ->middleware(['auth', 'throttle:6,1']) - ->name('verification.send'); - - Route::post('/logout', [AuthenticatedSessionController::class, 'destroy']) - ->middleware(config('fintech.auth.middleware')) - ->name('logout'); - - Route::middleware(config('fintech.auth.middleware'))->group(function () { - Route::apiResource('users', \Fintech\Auth\Http\Controllers\UserController::class); - // Route::apiResource('roles', \Fintech\Auth\Http\Controllers\RoleController::class); - // Route::apiResource('permissions', \Fintech\Auth\Http\Resources\PermissionCollection::class); - // Route::apiResource('teams', \Fintech\Auth\Http\Controllers\TeamController::class); - Route::apiSingleton('users.profile', \Fintech\Auth\Http\Controllers\ProfileController::class); - }); +Route::prefix('auth')->name('auth.')->group(function () { + Route::post('/register', [RegisteredUserController::class, 'store']) + ->middleware('guest') + ->name('register'); + + Route::post('/login', [AuthenticatedSessionController::class, 'store']) + ->middleware('guest') + ->name('login'); + + Route::post('/forgot-password', [PasswordResetLinkController::class, 'store']) + ->middleware('guest') + ->name('password.email'); + + Route::post('/reset-password', [NewPasswordController::class, 'store']) + ->middleware('guest') + ->name('password.store'); + + Route::get('/verify-email/{id}/{hash}', VerifyEmailController::class) + ->middleware(['auth', 'signed', 'throttle:6,1']) + ->name('verification.verify'); + + Route::post('/email/verification-notification', [EmailVerificationNotificationController::class, 'store']) + ->middleware(['auth', 'throttle:6,1']) + ->name('verification.send'); + + Route::post('/logout', [AuthenticatedSessionController::class, 'destroy']) + ->middleware(config('fintech.auth.middleware')) + ->name('logout'); + + Route::middleware(config('fintech.auth.middleware'))->group(function () { + Route::apiResource('users', \Fintech\Auth\Http\Controllers\UserController::class); + // Route::apiResource('roles', \Fintech\Auth\Http\Controllers\RoleController::class); + // Route::apiResource('permissions', \Fintech\Auth\Http\Resources\PermissionCollection::class); + // Route::apiResource('teams', \Fintech\Auth\Http\Controllers\TeamController::class); + Route::apiSingleton('users.profile', \Fintech\Auth\Http\Controllers\ProfileController::class); }); }); From ca61477ba473365b0d8791dc87e972c98ae66e57 Mon Sep 17 00:00:00 2001 From: Mohammad Hafijul Islam Date: Sun, 1 Oct 2023 14:27:19 +0600 Subject: [PATCH 2/3] LP-2 fix: registration validation moved to auth config --- config/auth.php | 44 +++++++++++++++++++++++ src/Http/Requests/RegistrationRequest.php | 4 +-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/config/auth.php b/config/auth.php index d78df2c..96e837c 100644 --- a/config/auth.php +++ b/config/auth.php @@ -72,6 +72,50 @@ 'login_id' => ['required', 'string'], 'password' => ['required', 'string', \Illuminate\Validation\Rules\Password::default()], ], + 'register' => [ + //user + 'name' => ['required', 'string', 'min:2', 'max:255'], + 'mobile' => ['required', 'string', 'min:10'], + 'email' => ['required', 'string', 'email:rfc,dns', 'min:2', 'max:255'], + 'login_id' => ['required', 'string', 'min:6', 'max:255'], + 'password' => ['required', 'string', \Illuminate\Validation\Rules\Password::default()], + 'pin' => ['required', 'string', 'min:4', 'max:16'], + 'parent_id' => ['nullable', 'integer'], + 'app_version' => ['nullable', 'string'], + 'fcm_token' => ['nullable', 'string'], + 'language' => ['nullable', 'string'], + 'currency' => ['nullable', 'string'], + + //profile + 'father_name' => ['string', 'nullable'], + 'mother_name' => ['string', 'nullable'], + 'gender' => ['string', 'nullable'], + 'marital_status' => ['string', 'nullable'], + 'occupation' => ['string', 'nullable'], + 'source_of_income' => ['string', 'nullable'], + 'id_type' => ['string', 'nullable'], + 'id_no' => ['string', 'nullable'], + 'id_issue_country' => ['string', 'nullable'], + 'id_expired_at' => ['string', 'nullable'], + 'id_issue_at' => ['string', 'nullable'], + 'profile_photo' => [\Illuminate\Validation\Rules\File::image(), 'nullable'], + 'scan' => [\Illuminate\Validation\Rules\File::types(['application/pdf', 'image/*']), 'nullable'], + 'scan_1' => [\Illuminate\Validation\Rules\File::types(['application/pdf', 'image/*']), 'nullable'], + 'scan_2' => [\Illuminate\Validation\Rules\File::types(['application/pdf', 'image/*']), 'nullable'], + 'date_of_birth' => ['date', 'nullable'], + 'permanent_address' => ['string', 'nullable'], + 'city_id' => ['integer', 'nullable'], + 'state_id' => ['integer', 'nullable'], + 'country_id' => ['integer', 'nullable'], + 'post_code' => ['string', 'nullable'], + 'present_address' => ['string', 'nullable'], + 'present_city_id' => ['integer', 'nullable'], + 'present_state_id' => ['integer', 'nullable'], + 'present_country_id' => ['integer', 'nullable'], + 'present_post_code' => ['string', 'nullable'], + 'note' => ['string', 'nullable'], + 'nationality' => ['string', 'nullable'], + ] ], /* diff --git a/src/Http/Requests/RegistrationRequest.php b/src/Http/Requests/RegistrationRequest.php index c38ca8e..81b4366 100644 --- a/src/Http/Requests/RegistrationRequest.php +++ b/src/Http/Requests/RegistrationRequest.php @@ -23,7 +23,7 @@ public function authorize(): bool */ public function rules(): array { - return [ + return config('fintech.auth.validation.register', [ //user 'name' => ['required', 'string', 'min:2', 'max:255'], 'mobile' => ['required', 'string', 'min:10'], @@ -66,6 +66,6 @@ public function rules(): array 'present_post_code' => ['string', 'nullable'], 'note' => ['string', 'nullable'], 'nationality' => ['string', 'nullable'], - ]; + ]); } } From 65e1e5e68ab0fa668868caacd56943bda4612b36 Mon Sep 17 00:00:00 2001 From: hafijul233 Date: Sun, 1 Oct 2023 08:28:10 +0000 Subject: [PATCH 3/3] Fix styling --- config/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/auth.php b/config/auth.php index 96e837c..08c3b39 100644 --- a/config/auth.php +++ b/config/auth.php @@ -115,7 +115,7 @@ 'present_post_code' => ['string', 'nullable'], 'note' => ['string', 'nullable'], 'nationality' => ['string', 'nullable'], - ] + ], ], /*