Compare commits

..

1 Commits

Author SHA1 Message Date
99d24c38c7 create forgote password 2026-06-01 13:43:16 +03:30
11 changed files with 362 additions and 63 deletions

View File

@@ -0,0 +1,89 @@
<?php
namespace App\Admin\Controllers;
use App\Http\Controllers\Controller;
use App\Models\User;
use App\Services\Auth\PasswordResetOtpService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Validation\ValidationException;
class ForgotPasswordOtpController extends Controller
{
public function __construct(
private readonly PasswordResetOtpService $otpService
) {}
public function sendOtp(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:users,email'],
]);
$email = $validated['email'];
$key = 'user-forgot-password-otp:' . $email . ':' . $request->ip();
if (RateLimiter::tooManyAttempts($key, 3)) {
throw ValidationException::withMessages([
'email' => ['Too many OTP requests. Please try again later.'],
]);
}
RateLimiter::hit($key, 600);
$user = User::query()->where('email', $email)->firstOrFail();
$this->otpService->sendOtp($user, 'user');
return response()->json([
'message' => 'OTP sent to your email.',
]);
}
public function verifyOtp(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:users,email'],
'otp' => ['required', 'digits:6'],
]);
$this->otpService->verifyOtp(
email: $validated['email'],
otp: $validated['otp'],
guard: 'user'
);
return response()->json([
'message' => 'OTP verified successfully.',
]);
}
public function resetPassword(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:users,email'],
'password' => ['required', 'confirmed',],
]);
$record = $this->otpService->ensureVerified(
email: $validated['email'],
guard: 'user'
);
$user = User::query()->where('email', $validated['email'])->firstOrFail();
$user->update([
'password' => Hash::make($validated['password']),
]);
$record->delete();
return response()->json([
'message' => 'User password reset successfully.',
]);
}
}

View File

@@ -0,0 +1,10 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class PasswordResetOtp extends Model
{
protected $guarded = ['id'];
}

View File

@@ -3,10 +3,8 @@
namespace App\Models; namespace App\Models;
use Database\Factories\UserGatewayFactory; use Database\Factories\UserGatewayFactory;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage;
class UserGateway extends Model class UserGateway extends Model
{ {
@@ -14,11 +12,4 @@ class UserGateway extends Model
use HasFactory; use HasFactory;
protected $guarded = ['id']; protected $guarded = ['id'];
protected function logo(): Attribute
{
return Attribute::make(
get: fn($value) => $value == null ? null : Storage::disk('public')->url($value)
);
}
} }

View File

@@ -0,0 +1,32 @@
<?php
namespace App\Notifications;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
class ResetPasswordOtpNotification extends Notification
{
use Queueable;
public function __construct(
private readonly string $otp
) {}
public function via(object $notifiable): array
{
return ['mail'];
}
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->subject('Reset Password OTP')
->greeting('Hello!')
->line('Your password reset code is:')
->line($this->otp)
->line('This code will expire in 10 minutes.')
->line('If you did not request password reset, ignore this email.');
}
}

View File

@@ -0,0 +1,103 @@
<?php
namespace App\Services\Auth;
use App\Models\PasswordResetOtp;
use App\Notifications\ResetPasswordOtpNotification;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\ValidationException;
class PasswordResetOtpService
{
public function sendOtp(Model $user, string $guard = 'user'): void
{
$otp = (string) random_int(100000, 999999);
PasswordResetOtp::query()->where('email', $user->email)
->where('guard', $guard)
->delete();
PasswordResetOtp::query()->create([
'email' => $user->email,
'guard' => $guard,
'otp' => Hash::make($otp),
'expires_at' => now()->addMinutes(10),
]);
$user->notify(new ResetPasswordOtpNotification($otp));
}
public function verifyOtp(string $email, string $otp, string $guard = 'user'): void
{
$record = PasswordResetOtp::query()->where('email', $email)
->where('guard', $guard)
->latest()
->first();
if (! $record) {
throw ValidationException::withMessages([
'otp' => ['Invalid OTP.'],
]);
}
if ($record->isExpired()) {
$record->delete();
throw ValidationException::withMessages([
'otp' => ['OTP has expired.'],
]);
}
if ($record->attempts >= 5) {
$record->delete();
throw ValidationException::withMessages([
'otp' => ['Too many wrong attempts. Please request a new OTP.'],
]);
}
if (! Hash::check($otp, $record->otp)) {
$record->increment('attempts');
throw ValidationException::withMessages([
'otp' => ['Invalid OTP.'],
]);
}
$record->update([
'verified_at' => now(),
]);
}
public function ensureVerified(string $email, string $guard = 'user'): PasswordResetOtp
{
$record = PasswordResetOtp::query()->where('email', $email)
->where('guard', $guard)
->latest()
->first();
if (! $record || ! $record->isVerified()) {
throw ValidationException::withMessages([
'otp' => ['Please verify OTP first.'],
]);
}
if ($record->isExpired()) {
$record->delete();
throw ValidationException::withMessages([
'otp' => ['OTP has expired.'],
]);
}
return $record;
}
public function deleteOtp(string $email, string $guard = 'user'): void
{
PasswordResetOtp::query()->where('email', $email)
->where('guard', $guard)
->delete();
}
}

View File

@@ -0,0 +1,89 @@
<?php
namespace App\User\Controllers;
use App\Http\Controllers\Controller;
use App\Models\Expert;
use Illuminate\Http\Request;
use App\Services\Auth\PasswordResetOtpService;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Validation\ValidationException;
class ForgotPasswordOtpController extends Controller
{
public function __construct(
private readonly PasswordResetOtpService $otpService
) {}
public function sendOtp(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:experts,email'],
]);
$email = $validated['email'];
$key = 'expert-forgot-password-otp:' . $email . ':' . $request->ip();
if (RateLimiter::tooManyAttempts($key, 3)) {
throw ValidationException::withMessages([
'email' => ['Too many OTP requests. Please try again later.'],
]);
}
RateLimiter::hit($key, 600);
$expert = Expert::query()->where('email', $email)->firstOrFail();
$this->otpService->sendOtp($expert, 'expert');
return response()->json([
'message' => 'OTP sent to your email.',
]);
}
public function verifyOtp(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:experts,email'],
'otp' => ['required', 'digits:6'],
]);
$this->otpService->verifyOtp(
email: $validated['email'],
otp: $validated['otp'],
guard: 'expert'
);
return response()->json([
'message' => 'OTP verified successfully.',
]);
}
public function resetPassword(Request $request): JsonResponse
{
$validated = $request->validate([
'email' => ['required', 'email', 'exists:experts,email'],
'password' => ['required', 'confirmed'],
]);
$record = $this->otpService->ensureVerified(
email: $validated['email'],
guard: 'expert'
);
$expert = Expert::query()->where('email', $validated['email'])->firstOrFail();
$expert->update([
'password' => Hash::make($validated['password']),
]);
$record->delete();
return response()->json([
'message' => 'Expert password reset successfully.',
]);
}
}

View File

@@ -14,7 +14,6 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Laravel\Passport\ClientRepository;
use Throwable; use Throwable;
class GatewayManagementController extends Controller class GatewayManagementController extends Controller
@@ -28,7 +27,7 @@ class GatewayManagementController extends Controller
$request, $request,
allowedFilters: ['*'], allowedFilters: ['*'],
allowedSortings: ['*'], allowedSortings: ['*'],
allowedSelects: ['*'], allowedSelects: ['id', 'name', 'domain', 'tax_id', 'bank_name', 'account_holder', 'iban', 'business_type_id', 'business_type_name'],
); );
} }
@@ -39,19 +38,9 @@ class GatewayManagementController extends Controller
{ {
$user = Auth::guard('web')->user(); $user = Auth::guard('web')->user();
$logo = $request->hasFile('logo') $logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
? FileFacade::save($request->file('logo'), "user_gateway/{$user->id}")
: null;
$passportClient = DB::transaction(function () use ($user, $logo, $request) {
$clientName = "Gateway {$request->name} - User {$user->id}";
$client = app(ClientRepository::class)->createPasswordGrantClient($clientName, 'users', true);
$client->Fill([
'owner_type' => get_class($user),
'owner_id' => $user->id,
])->save();
DB::transaction(function () use ($user, $logo, $request) {
UserGateway::query()->create([ UserGateway::query()->create([
'user_id' => $user->id, 'user_id' => $user->id,
'username' => $user->username, 'username' => $user->username,
@@ -64,20 +53,15 @@ class GatewayManagementController extends Controller
'business_type_id' => $request->business_type_id, 'business_type_id' => $request->business_type_id,
'business_type_name' => BusinessTypeEnum::name($request->business_type_id), 'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
'logo' => $logo, 'logo' => $logo,
'client_id' => $client->id,
'client_secret' => $client->secret,
]); ]);
$user->update(['authority_level' => 1]); $user->update(['authority_level' => 1]);
return $client;
}); });
return $this->successResponse([
'client_id' => $passportClient->id, return $this->successResponse();
'client_secret' => $passportClient->secret,
]);
} }
public function show(UserGateway $gateway): JsonResponse public function show(UserGateway $gateway): JsonResponse
{ {
return $this->successResponse($gateway); return $this->successResponse($gateway);

View File

@@ -13,7 +13,8 @@ class StoreRequest extends FormRequest
*/ */
public function authorize(): bool public function authorize(): bool
{ {
return true; } return Auth::guard('web')->user()->kyc_status;
}
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.

View File

@@ -0,0 +1,30 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('password_reset_otps', function (Blueprint $table) {
$table->id();
$table->string('email')->index();
$table->string('otp');
$table->string('guard_name');
$table->timestamp('expires_at');
$table->timestamp('verified_at')->nullable();
$table->unsignedTinyInteger('attempts')->default(0);
$table->timestamps();
});
}
public function down(): void
{
Schema::dropIfExists('password_reset_otps');
}
};

View File

@@ -1,30 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('user_gateways', function (Blueprint $table) {
$table->string('client_id')->nullable();
$table->string('client_secret')->nullable();
$table->integer('status')->default(0);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('user_gateways', function (Blueprint $table) {
$table->dropColumn(['client_id', 'client_secret','status']);
});
}
};

View File

@@ -77,7 +77,7 @@ Route::prefix('expert')
Route::prefix('profile') Route::prefix('profile')
->name('profile.') ->name('profile.')
->middleware('auth:expert') ->middleware('auth')
->controller(ProfileController::class) ->controller(ProfileController::class)
->group(function () { ->group(function () {
Route::get('info', 'info')->name('info'); Route::get('info', 'info')->name('info');