Merge pull request 'add authorization to all fib services' (#31) from feature/FibDTO into develop
Reviewed-on: #31
This commit was merged in pull request #31.
This commit is contained in:
@@ -11,21 +11,13 @@ class CancelPaymentService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.cancelPayment.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,13 +42,26 @@ class CancelPaymentService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,13 @@ class CheckPaymentStatusService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.checkPaymentStatus.url');
|
||||
$this->channelName = '';
|
||||
$this->channelName = 'fib_status';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,12 +42,26 @@ class CheckPaymentStatusService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::throw()
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,27 +11,14 @@ class CreatePaymentService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected array $inputParameters;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.createPayment.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setAccessToken(string $accessToken): void
|
||||
{
|
||||
$this->accessToken = $accessToken;
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->channelName = 'fib_create_payment';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
public function setInputParameters(array $inputParameters): void
|
||||
@@ -61,13 +48,26 @@ class CreatePaymentService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url, $this->inputParameters)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\DTO;
|
||||
namespace App\Services\FIB\DTO;
|
||||
|
||||
class FIBPaymentCreateDTO
|
||||
{
|
||||
@@ -11,21 +11,13 @@ class RefundService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.refund.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->channelName = 'fib_refund';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,13 +42,26 @@ class RefundService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,22 +6,30 @@ 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\FIB\CreatePaymentService;
|
||||
use App\Services\FIB\DTO\FIBPaymentCreateDTO;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
use Exception;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Throwable;
|
||||
|
||||
class PaymentService
|
||||
{
|
||||
public $fib_client;
|
||||
protected CreatePaymentService $create_payment_service;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(CreatePaymentService $create_payment_service)
|
||||
{
|
||||
$this->fib_client = new FibClient();
|
||||
$this->create_payment_service = $create_payment_service;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
* @throws Throwable
|
||||
*/
|
||||
public function createPayment(PaymentCreateDTO $dto)
|
||||
{
|
||||
try {
|
||||
return DB::transaction(function () use ($dto) {
|
||||
|
||||
$payment = Payment::query()->create([
|
||||
'user_id' => $dto->user_id,
|
||||
'username' => $dto->username,
|
||||
@@ -35,7 +43,7 @@ class PaymentService
|
||||
'user_gateway_id' => $dto->user_gateway_id,
|
||||
]);
|
||||
|
||||
$response = $this->fib_client->createPaymentService();
|
||||
$response = $this->create_payment_service->run();
|
||||
$fib_response_dto = FIBPaymentCreateDTO::fromResponse($response);
|
||||
|
||||
$transaction = Transaction::query()->create([
|
||||
@@ -51,7 +59,7 @@ class PaymentService
|
||||
// 'status' => '',
|
||||
]);
|
||||
|
||||
$fib_transactions = FibTransaction::query()->create([
|
||||
FibTransaction::query()->create([
|
||||
'transaction_id' => $transaction->id,
|
||||
'qrcode' => $fib_response_dto->qrCode,
|
||||
'readable_code' => $fib_response_dto->readableCode,
|
||||
@@ -64,9 +72,8 @@ class PaymentService
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
]);
|
||||
|
||||
return $payment;
|
||||
} catch (\Exception $exception) {
|
||||
throw new \Exception($exception->getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ class GatewayManagementController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
return DataTableFacade::run(
|
||||
UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
|
||||
UserGateway::query()->where('user_id', '=', Auth::guard('web')->user()->id),
|
||||
$request,
|
||||
allowedFilters: ['*'],
|
||||
allowedSortings: ['*'],
|
||||
|
||||
@@ -133,6 +133,24 @@ return [
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_create_payment' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/createPayment.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_status' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/status.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_refund' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/refund.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user