Compare commits
9 Commits
feature/Ge
...
feature/Fo
| Author | SHA1 | Date | |
|---|---|---|---|
| 99d24c38c7 | |||
| 9a01a83370 | |||
| 8438655f8c | |||
| 5040299efc | |||
| 26a0f79a6d | |||
| 1b5d339a53 | |||
| c73d50d096 | |||
| 738b21e182 | |||
| 77a4e98058 |
@@ -16,19 +16,6 @@ class AuthController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function register(RegisterRequest $request): JsonResponse
|
||||
{
|
||||
Expert::query()->create([
|
||||
'username' => $request->username,
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->password),
|
||||
]);
|
||||
|
||||
$request->session()->regenerate();
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function login(LoginRequest $request): JsonResponse
|
||||
{
|
||||
$credentials = ['password' => $request->password];
|
||||
@@ -39,8 +26,7 @@ class AuthController extends Controller
|
||||
$credentials['username'] = $request->login;
|
||||
}
|
||||
|
||||
if (Auth::attempt($credentials))
|
||||
{
|
||||
if (Auth::guard('expert')->attempt($credentials)) {
|
||||
$request->session()->regenerate();
|
||||
|
||||
return $this->successResponse();
|
||||
|
||||
@@ -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.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ enum BusinessTypeEnum: int
|
||||
};
|
||||
}
|
||||
|
||||
public function name($id): string
|
||||
public static function name($id): string
|
||||
{
|
||||
$mapArray = [
|
||||
1 => 'medical',
|
||||
|
||||
@@ -5,17 +5,19 @@ namespace App\Models;
|
||||
use Database\Factories\ExpertFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
|
||||
/**
|
||||
* @method roles()
|
||||
* @method permissions()
|
||||
*/
|
||||
class Expert extends Model
|
||||
class Expert extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<ExpertFactory> */
|
||||
use HasFactory;
|
||||
use HasRoles;
|
||||
|
||||
use Notifiable,HasFactory,HasRoles;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
protected string $guard_name = 'web';
|
||||
|
||||
@@ -9,4 +9,6 @@ class FibTransaction extends Model
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\FibTransactionFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
}
|
||||
|
||||
10
backend/app/Models/PasswordResetOtp.php
Normal file
10
backend/app/Models/PasswordResetOtp.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class PasswordResetOtp extends Model
|
||||
{
|
||||
protected $guarded = ['id'];
|
||||
}
|
||||
32
backend/app/Notifications/ResetPasswordOtpNotification.php
Normal file
32
backend/app/Notifications/ResetPasswordOtpNotification.php
Normal 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.');
|
||||
}
|
||||
}
|
||||
103
backend/app/Services/Auth/PasswordResetOtpService.php
Normal file
103
backend/app/Services/Auth/PasswordResetOtpService.php
Normal 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();
|
||||
}
|
||||
}
|
||||
86
backend/app/Services/FIB/FIBClient.php
Executable file
86
backend/app/Services/FIB/FIBClient.php
Executable file
@@ -0,0 +1,86 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\FIB;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
||||
class FIBClient
|
||||
{
|
||||
|
||||
public $auth_service;
|
||||
public $create_payment_service;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
}
|
||||
|
||||
public function client()
|
||||
{
|
||||
return Http::acceptJson()
|
||||
->contentType('application/json')
|
||||
->withToken($this->getAccessToken())
|
||||
->timeout(30);
|
||||
}
|
||||
|
||||
public function getAccessToken()
|
||||
{
|
||||
try {
|
||||
if ($this->isNotProduction()) {
|
||||
return json_decode(
|
||||
file_get_contents(storage_path('app/mock/fib/token.json'))
|
||||
);
|
||||
}
|
||||
$response = Http::withOptions([
|
||||
'proxy' => 'http://host.docker.internal:10808',
|
||||
])->asForm()->post('https://fib-stage.fib.iq/auth/realms/fib-online-shop/protocol/openid-connect/token', [
|
||||
'grant_type' => 'client_credentials',
|
||||
'client_id' => 'ipay-test-payment',
|
||||
'client_secret' => '8dae3180-f39c-448e-8b45-a01c8f4c8c15',
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
throw new \Exception(
|
||||
'Unable to authenticate with FIB: ' .
|
||||
$response->body()
|
||||
);
|
||||
}
|
||||
|
||||
$data = $response->json();
|
||||
|
||||
if (!isset($data['access_token'])) {
|
||||
throw new \Exception('FIB token missing in response');
|
||||
}
|
||||
|
||||
return $data['access_token'];
|
||||
} catch (\Exception $exception) {
|
||||
return $exception->getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
public function createPaymentService()
|
||||
{
|
||||
if ($this->isNotProduction()) {
|
||||
return json_decode(
|
||||
file_get_contents(storage_path('app/mock/fib/payment_create_success.json'))
|
||||
);
|
||||
}
|
||||
$response = $this->client()->post("https://fib-stage.fib.iq/protected/v1/payments");
|
||||
if ($response->failed()) {
|
||||
throw new \Exception(
|
||||
'Unable to authenticate with FIB: ' .
|
||||
$response->body()
|
||||
);
|
||||
}
|
||||
|
||||
$data = $response->json();
|
||||
if (!isset($data['paymentId'])) {
|
||||
throw new \Exception('FIB paymentId missing in response');
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function isNotProduction()
|
||||
{
|
||||
return env('APP_ENV') === 'local';
|
||||
}
|
||||
}
|
||||
38
backend/app/Services/Payments/DTO/FIBPaymentCreateDTO.php
Normal file
38
backend/app/Services/Payments/DTO/FIBPaymentCreateDTO.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\DTO;
|
||||
|
||||
class FIBPaymentCreateDTO
|
||||
{
|
||||
public string $paymentId;
|
||||
public string $readableCode;
|
||||
public string $qrCode;
|
||||
public string $validUntil;
|
||||
public string $personalAppLink;
|
||||
public string $businessAppLink;
|
||||
public string $corporateAppLink;
|
||||
|
||||
public function __construct(array $data)
|
||||
{
|
||||
$this->paymentId = $data['paymentId'];
|
||||
$this->readableCode = $data['readableCode'];
|
||||
$this->qrCode = $data['qrCode'];
|
||||
$this->validUntil = $data['validUntil'];
|
||||
$this->personalAppLink = $data['personalAppLink'];
|
||||
$this->businessAppLink = $data['businessAppLink'];
|
||||
$this->corporateAppLink = $data['corporateAppLink'];
|
||||
}
|
||||
|
||||
public static function fromResponse($data): FIBPaymentCreateDTO
|
||||
{
|
||||
return new self([
|
||||
'paymentId' => $data->paymentId,
|
||||
'readableCode' => $data->readableCode,
|
||||
'qrCode' => $data->qrCode,
|
||||
'validUntil' => $data->validUntil,
|
||||
'personalAppLink' => $data->personalAppLink,
|
||||
'businessAppLink' => $data->businessAppLink,
|
||||
'corporateAppLink' => $data->corporateAppLink,
|
||||
]);
|
||||
}
|
||||
}
|
||||
46
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
46
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\DTO;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PaymentCreateDTO
|
||||
{
|
||||
|
||||
public string $username;
|
||||
public int $user_id;
|
||||
public string $track_id;
|
||||
public string $amount;
|
||||
public string $currency;
|
||||
public string $callback_url;
|
||||
public string $ip;
|
||||
public int $user_gateway_id;
|
||||
|
||||
|
||||
public function __construct(array $data)
|
||||
{
|
||||
$this->username = $data['username'];
|
||||
$this->user_id = $data['user_id'];
|
||||
$this->track_id = $data['track_id'];
|
||||
$this->amount = $data['amount'];
|
||||
$this->currency = $data['currency'];
|
||||
$this->callback_url = $data['callback_url'];
|
||||
$this->ip = $data['ip'];
|
||||
$this->user_gateway_id = $data['user_gateway_id'];
|
||||
|
||||
}
|
||||
|
||||
public static function fromRequest(Request $request): PaymentCreateDTO
|
||||
{
|
||||
return new self([
|
||||
'username' => $request->username,
|
||||
'user_id' => '2',
|
||||
'track_id' => uuid_create(),
|
||||
'amount' => $request->amount,
|
||||
'currency' => $request->currency,
|
||||
'callback_url' => $request->callback_url,
|
||||
'ip' => $request->getClientIp(),
|
||||
'user_gateway_id' => $request->user_gateway_id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
37
backend/app/Services/Payments/FibAdapter.php
Normal file
37
backend/app/Services/Payments/FibAdapter.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments;
|
||||
|
||||
use App\Models\Payment;
|
||||
use App\Services\FIB\CreatePaymentService;
|
||||
use App\Services\FIB\FIBClient;
|
||||
|
||||
class FibAdapter
|
||||
{
|
||||
public function __construct(
|
||||
private CreatePaymentService $create_payment_service,
|
||||
private FIBClient $fib_client
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function createPayment(array $data)
|
||||
{
|
||||
Payment::query()->create([
|
||||
'user_id' => auth()->id(),
|
||||
'username' => $data['username'],
|
||||
'track_id' => $data['track_id'],
|
||||
'amount' => $data['amount'],
|
||||
'currency' => $data['currency'],
|
||||
'callback_url' => $data['callback_url'],
|
||||
'expires_at' => $data['expires_at'],
|
||||
'status_id' => $data['status_id'],
|
||||
'status_name' => $data['status_name'],
|
||||
'ip' => $data['ip'],
|
||||
'user_gateway_id' => $data['user_gateway_id'],
|
||||
'created_at' => $data['created_at'],
|
||||
'updated_at' => $data['updated_at'],
|
||||
]);
|
||||
$this->fib_client->client();
|
||||
}
|
||||
}
|
||||
72
backend/app/Services/Payments/PaymentService.php
Normal file
72
backend/app/Services/Payments/PaymentService.php
Normal file
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments;
|
||||
|
||||
use App\Enums\PaymentStatusEnum;
|
||||
use App\Models\FibTransaction;
|
||||
use App\Models\Payment;
|
||||
use App\Models\Transaction;
|
||||
use App\Services\FIB\FIBClient;
|
||||
use App\Services\Payments\DTO\FIBPaymentCreateDTO;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
|
||||
class PaymentService
|
||||
{
|
||||
public $fib_client;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->fib_client = new FibClient();
|
||||
}
|
||||
|
||||
public function createPayment(PaymentCreateDTO $dto)
|
||||
{
|
||||
try {
|
||||
$payment = Payment::query()->create([
|
||||
'user_id' => $dto->user_id,
|
||||
'username' => $dto->username,
|
||||
'track_id' => $dto->track_id,
|
||||
'amount' => $dto->amount,
|
||||
'currency' => $dto->currency,
|
||||
'callback_url' => $dto->callback_url,
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
'ip' => $dto->ip,
|
||||
'user_gateway_id' => $dto->user_gateway_id,
|
||||
]);
|
||||
|
||||
$response = $this->fib_client->createPaymentService();
|
||||
$fib_response_dto = FIBPaymentCreateDTO::fromResponse($response);
|
||||
|
||||
$transaction = Transaction::query()->create([
|
||||
'user_id' => $payment->user_id,
|
||||
'amount' => $payment->amount,
|
||||
'currency' => $payment->currency,
|
||||
'callback_url' => $payment->callback_url,
|
||||
// 'description' => '',
|
||||
// 'expires_in' => '',
|
||||
'payment_id' => $payment->id,
|
||||
'payment_track_id' => $payment->track_id,
|
||||
'user_gateway_id' => $payment->user_gateway_id,
|
||||
// 'status' => '',
|
||||
]);
|
||||
|
||||
$fib_transactions = FibTransaction::query()->create([
|
||||
'transaction_id' => $transaction->id,
|
||||
'qrcode' => $fib_response_dto->qrCode,
|
||||
'readable_code' => $fib_response_dto->readableCode,
|
||||
'personalAppLink' => $fib_response_dto->personalAppLink,
|
||||
'businessAppLink' => $fib_response_dto->businessAppLink,
|
||||
'corporateAppLink' => $fib_response_dto->corporateAppLink,
|
||||
'paymentId' => $fib_response_dto->paymentId,
|
||||
'paymentMethod' => 'fib',
|
||||
'validUntil' => $fib_response_dto->validUntil,
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
]);
|
||||
return $payment;
|
||||
} catch (\Exception $exception) {
|
||||
throw new \Exception($exception->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
89
backend/app/User/Controllers/ForgotPasswordOtpController.php
Normal file
89
backend/app/User/Controllers/ForgotPasswordOtpController.php
Normal 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.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
35
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
35
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Controllers\Payment;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
use App\Services\Payments\PaymentService;
|
||||
use App\Traits\ApiResponse;
|
||||
use App\User\Requests\Payment\FIB\StoreRequest;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
||||
class PaymentController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public $payment_service;
|
||||
|
||||
public function __construct(PaymentService $payment_service)
|
||||
{
|
||||
$this->payment_service = $payment_service;
|
||||
}
|
||||
|
||||
public function createPayment(StoreRequest $request): JsonResponse
|
||||
{
|
||||
try {
|
||||
$dto = PaymentCreateDTO::fromRequest($request);
|
||||
$result = $this->payment_service->createPayment($dto);
|
||||
return $this->successResponse($result);
|
||||
} catch (\Exception $exception) {
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,7 @@ class ProfileController extends Controller
|
||||
$user->update([
|
||||
'first_name' => $request->first_name,
|
||||
'last_name' => $request->last_name,
|
||||
'national_id' => $request->national_id,
|
||||
'national_id' => $user->kyc_status == 0 ? $request->national_id : $user->national_id,
|
||||
'address' => $request->address,
|
||||
'postal_code' => $request->postal_code,
|
||||
'phone_number' => $request->phone_number,
|
||||
|
||||
36
backend/app/User/Requests/Payment/FIB/StoreRequest.php
Normal file
36
backend/app/User/Requests/Payment/FIB/StoreRequest.php
Normal file
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Payment\FIB;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class StoreRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
return Auth::guard('web')->user()->kyc_status;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, ValidationRule|array|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'username' => ['required'],
|
||||
'track_id' => ['required'],
|
||||
'amount' => ['required'],
|
||||
'currency' => ['required'],
|
||||
'callback_url' => ['required'],
|
||||
'user_gateway_id' => ['required'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -24,12 +24,13 @@ class UserResource extends JsonResource
|
||||
'address' => $this->address,
|
||||
'postal_code' => $this->postal_code,
|
||||
'phone_number' => $this->phone_number,
|
||||
'province_id' => $this->provonce_id,
|
||||
'province_id' => $this->province_id,
|
||||
'province_name' => $this->province_name,
|
||||
'city_id' => $this->city_id,
|
||||
'city_name' => $this->city_name,
|
||||
'birth_date' => $this->birth_date,
|
||||
'kyc_status' => $this->kyc_status,
|
||||
'authority_level' => $this->authority_level,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Expert;
|
||||
use App\Models\User;
|
||||
|
||||
return [
|
||||
|
||||
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
return new class extends Migration {
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
@@ -14,15 +13,15 @@ return new class extends Migration
|
||||
Schema::create('transactions', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->foreignId('user_id')->constrained('users');
|
||||
$table->string('amount');
|
||||
$table->string('currency');
|
||||
$table->string('callback_url');
|
||||
$table->string('description');
|
||||
$table->dateTime('expires_in');
|
||||
$table->string('amount')->nullable();
|
||||
$table->string('currency')->nullable();
|
||||
$table->string('callback_url')->nullable();
|
||||
$table->string('description')->nullable();
|
||||
$table->dateTime('expires_in')->nullable();
|
||||
$table->foreignId('payment_id')->constrained('payments');
|
||||
$table->string('payment_track_id');
|
||||
$table->string('payment_track_id')->nullable();
|
||||
$table->foreignId('user_gateway_id')->constrained('user_gateways');
|
||||
$table->integer('status');
|
||||
$table->integer('status')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
return new class extends Migration {
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
@@ -14,23 +13,23 @@ return new class extends Migration
|
||||
Schema::create('fib_transactions', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->foreignId('transaction_id')->constrained('transactions');
|
||||
$table->text('qrcode');
|
||||
$table->string('readable_code');
|
||||
$table->string('personalAppLink');
|
||||
$table->string('businessAppLink');
|
||||
$table->string('corporateAppLink');
|
||||
$table->string('paymentId');
|
||||
$table->string('paymentMethod');
|
||||
$table->timestamp('validUntil');
|
||||
$table->text('qrcode')->nullable();
|
||||
$table->string('readable_code')->nullable();
|
||||
$table->string('personalAppLink')->nullable();
|
||||
$table->string('businessAppLink')->nullable();
|
||||
$table->string('corporateAppLink')->nullable();
|
||||
$table->string('paymentId')->nullable();
|
||||
$table->string('paymentMethod')->nullable();
|
||||
$table->timestamp('validUntil')->nullable();
|
||||
$table->foreignId('status_id')->constrained('fib_transaction_statuses');
|
||||
$table->string('status_name');
|
||||
$table->timestamp('paidAt');
|
||||
$table->string('paidAmount');
|
||||
$table->string('paidCurrency');
|
||||
$table->string('decliningReason');
|
||||
$table->timestamp('declinedAt');
|
||||
$table->string('paidByName');
|
||||
$table->string('paidByIban');
|
||||
$table->string('status_name')->nullable();
|
||||
$table->timestamp('paidAt')->nullable();
|
||||
$table->string('paidAmount')->nullable();
|
||||
$table->string('paidCurrency')->nullable();
|
||||
$table->string('decliningReason')->nullable();
|
||||
$table->timestamp('declinedAt')->nullable();
|
||||
$table->string('paidByName')->nullable();
|
||||
$table->string('paidByIban')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
};
|
||||
@@ -4,6 +4,7 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class FibTransactionStatusSeeder extends Seeder
|
||||
{
|
||||
@@ -12,6 +13,12 @@ class FibTransactionStatusSeeder extends Seeder
|
||||
*/
|
||||
public function run(): void
|
||||
{
|
||||
//
|
||||
DB::table('fib_transaction_statuses')->insert([
|
||||
['id' => 0, 'name' => 'unpaid', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 1, 'name' => 'cancelled', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 2, 'name' => 'expired', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 3, 'name' => 'paid', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 4, 'name' => 'refunded', 'created_at' => now(), 'updated_at' => now(),],
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
<?php
|
||||
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use \App\User\Controllers\Payment\PaymentController;
|
||||
|
||||
Route::get('/user', function (Request $request) {
|
||||
return $request->user();
|
||||
})->middleware('auth:api');
|
||||
|
||||
Route::prefix('v1')->group(function () {
|
||||
Route::prefix('payment')
|
||||
// ->middleware('auth:api')
|
||||
->group(function () {
|
||||
Route::post('/create_payment', [PaymentController::class, 'createPayment'])->name('create_payment');
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
@@ -12,7 +12,6 @@ Route::prefix('auth')
|
||||
->name('auth.')
|
||||
->controller(AuthController::class)
|
||||
->group(function () {
|
||||
Route::post('register', 'register')->name('register');
|
||||
Route::post('login', 'login')->name('login');
|
||||
Route::post('logout', 'logout')->name('logout');
|
||||
});
|
||||
|
||||
@@ -40,9 +40,7 @@ services:
|
||||
- payment
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: ${BACKEND_PATH}
|
||||
dockerfile: Dockerfile
|
||||
image: payment-backend:latest
|
||||
container_name: laravel
|
||||
tty: true
|
||||
restart: unless-stopped
|
||||
@@ -54,6 +52,8 @@ services:
|
||||
- postgres
|
||||
networks:
|
||||
- payment
|
||||
command: ["php", "artisan", "serve", "--host=0.0.0.0", "--port=9000"]
|
||||
# Prints "Overridden command!"
|
||||
# logging:
|
||||
# driver: "syslog"
|
||||
# options:
|
||||
|
||||
Reference in New Issue
Block a user