From a3dfa359d57b3aa71e848e437a8b227e53ddbde2 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:11:08 +0000 Subject: [PATCH 01/32] feat(http-client): Set User-Agent header dynamically This commit updates the HTTP client code to set the 'User-Agent' header dynamically based on the SDK version. The User-Agent now follows the format 'FlutterwavePHP/{SDK_VERSION}', where {SDK_VERSION} is the version of the SDK obtained from the EnvVariables class.This change improves the clarity of user-agent information for HTTP requests, helping with tracking and debugging. --- src/Config/AbstractConfig.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Config/AbstractConfig.php b/src/Config/AbstractConfig.php index 6a34aad..63a9cc7 100644 --- a/src/Config/AbstractConfig.php +++ b/src/Config/AbstractConfig.php @@ -43,7 +43,11 @@ protected function __construct(string $secret_key, string $public_key, string $e [ 'base_uri' => EnvVariables::BASE_URL, 'timeout' => 60, - RequestOptions::VERIFY => \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath() + 'headers' => ['User-Agent' => sprintf( + 'FlutterwavePHP/%d', EnvVariables::SDK_VERSION + )], + RequestOptions::VERIFY => + \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath() ] ); From a9128db326e92b5df98c2929166c32e195d2bc76 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:25:36 +0000 Subject: [PATCH 02/32] fix: Transaction Service Event Tracker The Transaction Service no longer requires a separate event handler as it not has the trait of a event handler. --- src/Service/Transactions.php | 43 ++++++++++---------- tests/Unit/Service/TransactionTest.php | 56 ++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 22 deletions(-) diff --git a/src/Service/Transactions.php b/src/Service/Transactions.php index ea40d0e..155b20d 100644 --- a/src/Service/Transactions.php +++ b/src/Service/Transactions.php @@ -5,12 +5,13 @@ namespace Flutterwave\Service; use Flutterwave\Contract\ConfigInterface; -use Flutterwave\EventHandlers\TransactionVerificationEventHandler; +use Flutterwave\EventHandlers\EventTracker; use Flutterwave\Traits\ApiOperations\Post; use Psr\Http\Client\ClientExceptionInterface; class Transactions extends Service { + use EventTracker; use Post; public const ENDPOINT = 'transactions'; @@ -26,14 +27,12 @@ class Transactions extends Service private array $payment_type = [ 'card','debit_ng_account','mobilemoney','bank_transfer', 'ach_payment', ]; - private TransactionVerificationEventHandler $eventHandler; public function __construct(?ConfigInterface $config = null) { parent::__construct($config); - $this->baseUrl = $this->config::BASE_URL; $this->end_point = Transactions::ENDPOINT; - $this->eventHandler = new TransactionVerificationEventHandler(); + } /** @@ -43,13 +42,13 @@ public function verify(string $transactionId): \stdClass { $this->checkTransactionId($transactionId); $this->logger->notice('Transaction Service::Verifying Transaction...' . $transactionId); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', self::ENDPOINT . "/{$transactionId}/verify", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -60,13 +59,13 @@ public function verify(string $transactionId): \stdClass public function verifyWithTxref(string $tx_ref): \stdClass { $this->logger->notice('Transaction Service::Verifying Transaction...' . $tx_ref); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', self::ENDPOINT . '/verify_by_reference?tx_ref=' . $tx_ref, ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -77,13 +76,13 @@ public function refund(string $trasanctionId): \stdClass { $this->checkTransactionId($trasanctionId); $this->logger->notice("Transaction Service::Refunding Transaction...{$trasanctionId}"); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', self::ENDPOINT . "/{$trasanctionId}/refund", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -93,13 +92,13 @@ public function refund(string $trasanctionId): \stdClass public function getAllTransactions(): \stdClass { $this->logger->notice('Transaction Service::Retrieving all Transaction for Merchant'); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', self::ENDPOINT, ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -110,13 +109,13 @@ public function getRefundInfo(string $trasanctionId): \stdClass { $this->checkTransactionId($trasanctionId); $this->logger->notice("Transaction Service::Retrieving refund:Transactionid => {$trasanctionId}"); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', "refunds/{$trasanctionId}", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -151,13 +150,13 @@ public function getTransactionFee( $logData = json_encode($data); $this->logger->notice("Transaction Service::Retrieving Transaction Fee: Util => {$logData}"); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', self::ENDPOINT . "/fee?{$query}", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -168,13 +167,13 @@ public function resendFailedHooks(string $transactionId): \stdClass { $this->checkTransactionId($transactionId); $this->logger->notice("Transaction Service::Resending Transaction Webhook: TransactionId => {$transactionId}"); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, - 'GET', + 'POST', self::ENDPOINT . "/{$transactionId}/resend-hook", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -187,13 +186,13 @@ public function retrieveTimeline(string $transactionId): \stdClass $this->logger->notice( "Transaction Service::Retrieving Transaction Timeline: TransactionId => {$transactionId}" ); - TransactionVerificationEventHandler::startRecording(); + self::startRecording(); $response = $this->request( null, 'GET', - self::ENDPOINT . "/{$transactionId}/timeline", + self::ENDPOINT . "/{$transactionId}/events", ); - TransactionVerificationEventHandler::setResponseTime(); + self::setResponseTime(); return $response; } diff --git a/tests/Unit/Service/TransactionTest.php b/tests/Unit/Service/TransactionTest.php index f8e8ebe..f6ba683 100644 --- a/tests/Unit/Service/TransactionTest.php +++ b/tests/Unit/Service/TransactionTest.php @@ -2,9 +2,65 @@ namespace Unit\Service; +use Flutterwave\Service\Transactions; use PHPUnit\Framework\TestCase; class TransactionTest extends TestCase { + public Transactions $service; + protected function setUp(): void + { + $this->service = new Transactions(); + } + + /** + * @depends Unit\Service\MomoTest::testInitiateTanzaniaRedirect + */ + public function testVerifyingTransaction(string $tx_ref) + { + $result = $this->service->verifyWithTxref($tx_ref); + $data = $result->data; + $this->assertSame($data->customer->email, "developers@flutterwavego.com"); + return [ "id" => $data->id, "amount" => $data->amount, "currency" => $data->currency ]; + } + + /** + * @depends testVerifyingTransaction + */ + public function testVerifyingTransactionWithId(array $data) + { + $tx_id = $data['id']; + + $result = $this->service->verify($tx_id); + $data = $result->data; + $this->assertSame($data->customer->email, "developers@flutterwavego.com"); + } + + /** + * @depends testVerifyingTransaction + */ + public function testResendingFailedHooks( array $data ) + { + sleep(6); + $tx_id = $data['id']; + $result = $this->service->resendFailedHooks($tx_id); + $this->assertTrue( $result->status === "success" && $result->data === "hook sent"); + } + + /** + * @depends testVerifyingTransaction + */ + public function testRetrievingTimeline( array $data ) + { + $tx_id = $data['id']; + $result = $this->service->retrieveTimeline($tx_id); + $this->assertTrue( $result->status === "success" && $result->message === "Transaction events fetched"); + } + + // public function testValidateCharge( string $flw_ref ) + // { + // $result = $this->service->validate("3310", $flw_ref); + // dd($result); + // } } \ No newline at end of file From 2b8541d7b02655e0788f8e85060b47df1ea979e1 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:32:10 +0000 Subject: [PATCH 03/32] test: Handle PHPSAPI requests handle request via the command line using set environment variables. --- setup.php | 26 ++++++++++++++++++-------- tests/Unit/Service/CheckoutTest.php | 20 +++++++++++--------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/setup.php b/setup.php index 1c5b813..b7e7078 100644 --- a/setup.php +++ b/setup.php @@ -17,7 +17,12 @@ //check if the current version of php is compatible if(!Helper\CheckCompatibility::isCompatible()) { - echo "Flutterwave: This SDK only support php version ". Helper\CheckCompatibility::MINIMUM_COMPATIBILITY. " or greater."; + if (PHP_SAPI === 'cli') { + echo "❌ Flutterwave: This SDK only support php version ". Helper\CheckCompatibility::MINIMUM_COMPATIBILITY. " or greater."; + } else { + echo "Flutterwave: This SDK only support php version ". Helper\CheckCompatibility::MINIMUM_COMPATIBILITY. " or greater."; + } + exit; } @@ -28,22 +33,27 @@ try{ foreach($flutterwaveKeys as $key) { - if( empty( $_ENV[ $key ] ) ) + if(empty($_ENV[ $key ]) && empty(\getenv($key))) { throw new InvalidArgumentException("$key environment variable missing."); } } }catch(\Exception $e) { - echo "Flutterwave sdk: " .$e->getMessage().""; + if (PHP_SAPI === 'cli') { + echo "❌❌Flutterwave sdk: " .$e->getMessage(); + echo "Kindly create a .env in the project root and add the required environment variables. ❌". PHP_EOL; + } else { + echo "Flutterwave sdk: " .$e->getMessage().""; + echo "
Kindly create a .env in the project root and add the required environment variables."; + } - echo "
Kindly create a .env in the project root and add the required environment variables."; exit; } $keys = [ - 'SECRET_KEY' => $_ENV['SECRET_KEY'], - 'PUBLIC_KEY' => $_ENV['PUBLIC_KEY'], - 'ENV' => $_ENV['ENV'], - 'ENCRYPTION_KEY' => $_ENV['ENCRYPTION_KEY'] + 'SECRET_KEY' => $_ENV['SECRET_KEY'] ?? \getenv('SECRET_KEY'), + 'PUBLIC_KEY' => $_ENV['PUBLIC_KEY'] ?? \getenv('PUBLIC_KEY'), + 'ENV' => $_ENV['ENV'] ?? \getenv('ENV'), + 'ENCRYPTION_KEY' => $_ENV['ENCRYPTION_KEY'] ?? \getenv('ENCRYPTION_KEY') ]; \ No newline at end of file diff --git a/tests/Unit/Service/CheckoutTest.php b/tests/Unit/Service/CheckoutTest.php index f8680ac..ee57ddc 100644 --- a/tests/Unit/Service/CheckoutTest.php +++ b/tests/Unit/Service/CheckoutTest.php @@ -77,13 +77,15 @@ public function checkoutProvider() { return [ [ Modal::STANDARD, - [ "tx_ref" => 'FLW_TEST|' . random_int( 10, 2000) . '|' . uniqid('aMx') ], + [ + "tx_ref" => 'FLW_TEST|' . random_int(10, 2000) . '|' . uniqid('aMx') + ], new ModalEventHandler(), ForkConfig::setUp( - $_ENV['SECRET_KEY'], - $_ENV['PUBLIC_KEY'], - $_ENV['ENCRYPTION_KEY'], - $_ENV['ENV'] + $_ENV['SECRET_KEY'] ?? \getenv('SECRET_KEY'), + $_ENV['PUBLIC_KEY'] ?? \getenv('PUBLIC_KEY'), + $_ENV['ENCRYPTION_KEY'] ?? \getenv('ENCRYPTION_KEY'), + $_ENV['ENV'] ?? \getenv('ENV') ), [ 'amount' => 3000, @@ -100,10 +102,10 @@ public function checkoutProvider() { [ "tx_ref" => 'FLW_TEST|' . random_int( 10, 2000) . '|' . uniqid('mAx') ], new ModalEventHandler(), ForkConfig::setUp( - $_ENV['SECRET_KEY'], - $_ENV['PUBLIC_KEY'], - $_ENV['ENCRYPTION_KEY'], - $_ENV['ENV'] + $_ENV['SECRET_KEY'] ?? \getenv('SECRET_KEY'), + $_ENV['PUBLIC_KEY'] ?? \getenv('PUBLIC_KEY'), + $_ENV['ENCRYPTION_KEY'] ?? \getenv('ENCRYPTION_KEY'), + $_ENV['ENV'] ?? \getenv('ENV') ), [ 'amount' => 1500, From 38f6cd49e596971a573e9a4cbd50ffa7b5c28d83 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:34:31 +0000 Subject: [PATCH 04/32] Update CardTest.php Update Test using new Test cards. --- tests/Unit/Service/CardTest.php | 49 +++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/tests/Unit/Service/CardTest.php b/tests/Unit/Service/CardTest.php index 93c9b5a..30fa0d3 100644 --- a/tests/Unit/Service/CardTest.php +++ b/tests/Unit/Service/CardTest.php @@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase; use Flutterwave\Util\Currency; use Flutterwave\Test\Resources\Setup\Config; +use Test_Cards; class CardTest extends TestCase { @@ -32,12 +33,7 @@ public function testAuthModeReturnPin() ], "preauthorize" => false, "payment_plan" => null, - "card_details" => [ - "card_number" => "5531886652142950", - "cvv" => "564", - "expiry_month" => "09", - "expiry_year" => "32" - ] + "card_details" => Test_Cards::MSTR_CARD_PIN_TWO ], ]; @@ -93,12 +89,7 @@ public function testAuthModeReturnRedirect() ], "preauthorize" => false, "payment_plan" => null, - "card_details" => [ - "card_number" => "5531886652142950", - "cvv" => "564", - "expiry_month" => "09", - "expiry_year" => "32" - ] + "card_details" => Test_Cards::MSTR_CARD_PIN_ONE ], ]; @@ -155,8 +146,42 @@ public function testAuthModeReturnRedirect() // $this->assertSame(AuthMode::AVS, $result['mode']); // } + public function testPreuthCard() + { + $data = [ + "amount" => 2000, + "currency" => Currency::NGN, + "tx_ref" => "TEST-".uniqid().time(), + "redirectUrl" => "https://www.example.com", + "additionalData" => [ + "subaccounts" => [ + ["id" => "RSA_345983858845935893"] + ], + "meta" => [ + "unique_id" => uniqid().uniqid() + ], + "preauthorize" => false, + "payment_plan" => null, + "card_details" => Test_Cards::PREATH + ], + ]; + + $cardpayment = Flutterwave::create("card"); + $customerObj = $cardpayment->customer->create([ + "full_name" => "Olaobaju Abraham", + "email" => "ol868gjdfjua@gmail.com", + "phone" => "+2349062985861" + ]); + $data['customer'] = $customerObj; + $payload = $cardpayment->payload->create($data); + $result = $cardpayment->initiate($payload); + + $this->assertTrue(!empty($result['url'])); + } + public function testAuthModelReturnNoauth() { $this->assertTrue(true); } + } \ No newline at end of file From efc50ae1f657493a980ac3638a303beef58f63e4 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:37:18 +0000 Subject: [PATCH 05/32] add SDK_VERSION to environment variables --- src/Helper/EnvVariables.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Helper/EnvVariables.php b/src/Helper/EnvVariables.php index 1806271..f70babe 100644 --- a/src/Helper/EnvVariables.php +++ b/src/Helper/EnvVariables.php @@ -7,6 +7,7 @@ class EnvVariables { public const VERSION = 'v3'; + public const SDK_VERSION = '1.0.7'; public const BASE_URL = 'https://api.flutterwave.com/' . self::VERSION; public const TIME_OUT = 30; } From ad40977ff21aa68baa4eaf11b79cd20e87b0ff4f Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:39:49 +0000 Subject: [PATCH 06/32] test: New Test cards --- tests/Resources/Card/test_cards.php | 77 +++++++++++++++++++++++++++++ tests/bootstrap.php | 6 ++- 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 tests/Resources/Card/test_cards.php diff --git a/tests/Resources/Card/test_cards.php b/tests/Resources/Card/test_cards.php new file mode 100644 index 0000000..72f8e8e --- /dev/null +++ b/tests/Resources/Card/test_cards.php @@ -0,0 +1,77 @@ + "5531886652142950", + "cvv" => "564", + "expiry_month" => "09", + "expiry_year" => "32" + ]; + + const MSTR_CARD_PIN_TWO = [ + "card_number" => "5399838383838381", + "cvv" => "470", + "expiry_month" => "10", + "expiry_year" => "31" + ]; + + const MSTR_3DS = [ + "card_number" => "5438898014560229", + "cvv" => "564", + "expiry_month" => "10", + "expiry_year" => "31" + ]; + + const VISA_3DS = [ + "card_number" => "4187427415564246", + "cvv" => "828", + "expiry_month" => "09", + "expiry_year" => "32" + ]; + + const VISA_3DS_TWO = [ + "card_number" => "4242424242424242", + "cvv" => "812", + "expiry_month" => "01", + "expiry_year" => "31" + ]; + + const VISA_3DS_THREE = [ + "card_number" => "4751763236699647", + "cvv" => "812", + "expiry_month" => "09", + "expiry_year" => "35" + ]; + + const VERVE_NOAUTH = [ + "card_number" => "5061460410120223210", + "cvv" => "780", + "expiry_month" => "12", + "expiry_year" => "31" + ]; + + const VERVE_PIN = [ + "card_number" => "5061460166976054667", + "cvv" => "780", + "expiry_month" => "10", + "expiry_year" => "22" + ]; + + const AVS = [ + "card_number" => "4556052704172643", + "cvv" => "899", + "expiry_month" => "09", + "expiry_year" => "32" + ]; + + const PREATH = [ + "card_number" => "5377283645077450", + "cvv" => "789", + "expiry_month" => "09", + "expiry_year" => "31" + ]; +} \ No newline at end of file diff --git a/tests/bootstrap.php b/tests/bootstrap.php index a0eed40..79e0b0d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -35,6 +35,8 @@ '*/src/Controller/*', ]); -# flutterwave setup. -require_once __DIR__ . '/../setup.php'; +// Load test cards. +require_once __DIR__ . '/Resources/Card/test_cards.php'; + + From d51801f19c388e47923023a7805fd9e581c5312d Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:41:54 +0000 Subject: [PATCH 07/32] fix: handle vbssecure auth modes in the card charge service --- src/EventHandlers/CardEventHandler.php | 9 ++++++++- src/Service/CardPayment.php | 16 +++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/EventHandlers/CardEventHandler.php b/src/EventHandlers/CardEventHandler.php index f254321..5762426 100644 --- a/src/EventHandlers/CardEventHandler.php +++ b/src/EventHandlers/CardEventHandler.php @@ -95,7 +95,8 @@ public function onAuthorization(\stdClass $response, ?array $resource = null): a { $logger = null; $data = []; - $mode = $response->meta->authorization->mode; + + $mode = $resource['mode'] ?? $response->meta->authorization->mode; if (property_exists($response, 'data')) { $transactionId = $response->data->id; @@ -124,6 +125,12 @@ public function onAuthorization(\stdClass $response, ?array $resource = null): a $data['instruction'] = $response->data->processor_response; $data['validate'] = true; break; + default: + $data['data_to_save']['status'] = $response->data->status; + $data['data_to_save']['amount'] = $response->data->amount; + $data['data_to_save']['currency'] = $response->data->currency; + $data['data_to_save']['customer_name'] = $response->data->customer->name; + $data['data_to_save']['customer_email'] = $response->data->customer->email; } $data['mode'] = $mode; diff --git a/src/Service/CardPayment.php b/src/Service/CardPayment.php index 0bbf487..b21430e 100644 --- a/src/Service/CardPayment.php +++ b/src/Service/CardPayment.php @@ -131,14 +131,20 @@ public function encryption(string $params): string */ public function handleAuthState(\stdClass $response, $payload): array { - $mode = $response->meta->authorization->mode; + // dd($response); + $data['request_data'] = null; + + $mode = (\property_exists($response, 'meta') ) ? + $response->meta->authorization->mode: $response->data->auth_model; if ($mode === 'pin') { - $data = $this->eventHandler->onAuthorization($response, ['logger' => $this->logger]); $data['request_data'] = $payload; - return $data; } - - return $this->eventHandler->onAuthorization($response, ['logger' => $this->logger]); + $extra_data = $this->eventHandler->onAuthorization( + $response, + ['logger' => $this->logger, 'mode' => $mode] + ); + + return [ 'request_data' => $data['request_data'], ...$extra_data ]; } public function getName(): string From c0ef792379b8fef5266ef733f1699e1742e84d07 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:43:14 +0000 Subject: [PATCH 08/32] test: create test provider for TransactionTest --- tests/Unit/Service/MomoTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Unit/Service/MomoTest.php b/tests/Unit/Service/MomoTest.php index 0afd9ab..d57137b 100644 --- a/tests/Unit/Service/MomoTest.php +++ b/tests/Unit/Service/MomoTest.php @@ -66,6 +66,8 @@ public function testInitiateTanzaniaRedirect(){ $payload = $momopayment->payload->create($data); $result = $momopayment->initiate($payload); $this->assertSame('pending',$result['data_to_save']['status']); + + return $data['tx_ref']; } public function testAuthModeGhanaRedirect(){ From 563d04f3a6e79a2c7a1dcde6403f8a233c0e2351 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:44:48 +0000 Subject: [PATCH 09/32] example: update card sample with config --- examples/card.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/examples/card.php b/examples/card.php index 3141857..0f7ade0 100644 --- a/examples/card.php +++ b/examples/card.php @@ -4,7 +4,26 @@ use Flutterwave\Util\AuthMode; use Flutterwave\Util\Currency; -\Flutterwave\Flutterwave::bootstrap(); +use Flutterwave\Config\ForkConfig; +use Dotenv\Dotenv; +// custom config. + +if(!file_exists( '.env' )) { + $dotenv = Dotenv::createImmutable(__DIR__."/../"); +} else { + $dotenv = Dotenv::createImmutable(__DIR__."/"); +} + +$dotenv->safeLoad(); + +$config = ForkConfig::setUp( + $_ENV['SECRET_KEY'], + $_ENV['PUBLIC_KEY'], + $_ENV['ENV'], + $_ENV['ENCRYPTION_KEY'] +); + +\Flutterwave\Flutterwave::bootstrap($config); try { @@ -48,6 +67,8 @@ $data['customer'] = $customerObj; $payload = $cardpayment->payload->create($data); + + if(!empty($_REQUEST)) { $request = $_REQUEST; @@ -59,7 +80,7 @@ if(isset($request['make'])){ $result = $cardpayment->initiate($payload); - + dd($cardpayment); if($result['mode'] === AuthMode::PIN){ $instruction = $result['instruction']; require __DIR__."/view/form/pin.php"; From b94aed19868a7bc9d27769b9548dd2d89ab417ec Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:46:02 +0000 Subject: [PATCH 10/32] dev: update makefile and .gitpod.yml config --- .gitpod.yml | 10 ++++++++++ Makefile | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..63a3e4f --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,10 @@ +# This configuration file was automatically generated by Gitpod. +# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) +# and commit this file to your remote git repository to share the goodness with others. + +# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart + +tasks: + - init: make + + diff --git a/Makefile b/Makefile index 0fa8af9..18993bf 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ .PHONY: init -test: +check: @echo "Installing dependencies..." @composer install @echo "Installing dependencies... Done" @./vendor/bin/pest --coverage --min=0 --coverage-clover ./coverage.xml +test: + @./vendor/bin/pest --coverage --min=0 --coverage-clover ./coverage.xml + + From dd6b9de38e7daae5c599e74014ff65931a666bf2 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 11:53:45 +0000 Subject: [PATCH 11/32] update: change-review workflow --- .github/workflows/change-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/change-review.yml b/.github/workflows/change-review.yml index 2dc7be7..66949a1 100644 --- a/.github/workflows/change-review.yml +++ b/.github/workflows/change-review.yml @@ -58,7 +58,7 @@ jobs: ls -a ${{ github.workspace }} - name: run unit tests and coverage scan - run: ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml + run: PUBLIC_KEY=${PUBLIC_KEY} SECRET_KEY=${SECRET_KEY} ENCRYPTION_KEY=${ENCRYPTION_KEY} ENV=${ENV} ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml - name: Upload to Codecov uses: codecov/codecov-action@v2 From caf302fbf88dd73b5ac4b5dab3396bd13e9706e2 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 12:14:09 +0000 Subject: [PATCH 12/32] update: change-review workflow --- .github/workflows/change-review.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/change-review.yml b/.github/workflows/change-review.yml index 66949a1..644c89e 100644 --- a/.github/workflows/change-review.yml +++ b/.github/workflows/change-review.yml @@ -51,14 +51,15 @@ jobs: - name: 'Create env file' run: | touch .env - echo PUBLIC_KEY=${PUBLIC_KEY} >> .env - echo SECRET_KEY=${SECRET_KEY} >> .env - echo ENCRYPTION_KEY=${ENCRYPTION_KEY} >> .env - echo ENV=${ENV} >> .env + echo PUBLIC_KEY=${{ secrets.PUBLIC_KEY }} >> .env + echo SECRET_KEY=${{ secrets.SECRET_KEY }} >> .env + echo ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} >> .env + echo ENV=${{ secrets.ENV }} >> .env ls -a ${{ github.workspace }} + echo ${{ secrets.ENV }} - name: run unit tests and coverage scan - run: PUBLIC_KEY=${PUBLIC_KEY} SECRET_KEY=${SECRET_KEY} ENCRYPTION_KEY=${ENCRYPTION_KEY} ENV=${ENV} ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml + run: ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml - name: Upload to Codecov uses: codecov/codecov-action@v2 From 367b67b90d53375190c9c0eed9b1d55b5d20e872 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 12:17:27 +0000 Subject: [PATCH 13/32] update: change-review workflow --- .github/workflows/change-review.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/change-review.yml b/.github/workflows/change-review.yml index 644c89e..bb6516e 100644 --- a/.github/workflows/change-review.yml +++ b/.github/workflows/change-review.yml @@ -51,12 +51,12 @@ jobs: - name: 'Create env file' run: | touch .env - echo PUBLIC_KEY=${{ secrets.PUBLIC_KEY }} >> .env - echo SECRET_KEY=${{ secrets.SECRET_KEY }} >> .env - echo ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} >> .env - echo ENV=${{ secrets.ENV }} >> .env + echo PUBLIC_KEY=$PUBLIC_KEY >> .env + echo SECRET_KEY=$SECRET_KEY >> .env + echo ENCRYPTION_KEY=$ENCRYPTION_KEY >> .env + echo ENV=$ENV >> .env ls -a ${{ github.workspace }} - echo ${{ secrets.ENV }} + echo $ENV - name: run unit tests and coverage scan run: ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml From 35713ff1111ec609443fe9859bece284a5cce78e Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 12:26:17 +0000 Subject: [PATCH 14/32] update: change-review workflow --- .github/workflows/change-review.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/change-review.yml b/.github/workflows/change-review.yml index bb6516e..6f514ea 100644 --- a/.github/workflows/change-review.yml +++ b/.github/workflows/change-review.yml @@ -48,18 +48,13 @@ jobs: - name: Install dependencies run: composer install --prefer-dist --no-progress - - name: 'Create env file' - run: | - touch .env - echo PUBLIC_KEY=$PUBLIC_KEY >> .env - echo SECRET_KEY=$SECRET_KEY >> .env - echo ENCRYPTION_KEY=$ENCRYPTION_KEY >> .env - echo ENV=$ENV >> .env - ls -a ${{ github.workspace }} - echo $ENV - - name: run unit tests and coverage scan run: ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml + env: + PUBLIC_KEY: ${{ secrets.PUBLIC_KEY }} + SECRET_KEY: ${{ secrets.SECRET_KEY }} + ENCRYPTION_KEY: ${{ secrets.ENCRYPTION_KEY }} + ENV: ${{ secrets.ENV }} - name: Upload to Codecov uses: codecov/codecov-action@v2 From 3a747c54ff385e5741f40cc2500dfb855c73b93d Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 12:39:10 +0000 Subject: [PATCH 15/32] update: change-review workflow include php8.3 test package with php8.3 --- .github/workflows/change-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/change-review.yml b/.github/workflows/change-review.yml index 6f514ea..8d3895c 100644 --- a/.github/workflows/change-review.yml +++ b/.github/workflows/change-review.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.4, 8.1, 8.2] + php: [7.4, 8.1, 8.2, 8.3] env: XDEBUG_MODE: coverage From 24f766f0acce42aba452cfbb97cd0dda2d587eae Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 13:04:55 +0000 Subject: [PATCH 16/32] test: remove dirs from bypass whitelist --- tests/bootstrap.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 79e0b0d..6bd878b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,4 +1,5 @@ Date: Sun, 15 Oct 2023 13:05:46 +0000 Subject: [PATCH 17/32] dev: gitpod workspace setup --- .gitpod.Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitpod.Dockerfile diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000..5023896 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,4 @@ +FROM gitpod/workspace-full + +RUN sudo pecl channel-update pecl.php.net && \ + sudo pecl install xdebug \ No newline at end of file From 3bb2015e963186e74ef1533f25e6575b287e60d8 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 13:31:52 +0000 Subject: [PATCH 18/32] dev: complete gitpod workspace settings --- .docker/.gitpod.Dockerfile | 3 +++ .gitpod.Dockerfile | 4 ---- .gitpod.yml | 7 ++++++- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .docker/.gitpod.Dockerfile delete mode 100644 .gitpod.Dockerfile diff --git a/.docker/.gitpod.Dockerfile b/.docker/.gitpod.Dockerfile new file mode 100644 index 0000000..1c3bd34 --- /dev/null +++ b/.docker/.gitpod.Dockerfile @@ -0,0 +1,3 @@ +FROM gitpod/workspace-full + +RUN sudo install-packages php-xdebug \ No newline at end of file diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile deleted file mode 100644 index 5023896..0000000 --- a/.gitpod.Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM gitpod/workspace-full - -RUN sudo pecl channel-update pecl.php.net && \ - sudo pecl install xdebug \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml index 63a3e4f..485aafb 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,7 +4,12 @@ # Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart +image: + file: .docker/.gitpod.Dockerfile + tasks: - init: make - +vscode: + extensions: + - felixfbecker.php-debug From df276a754cfbda8761c5020512dd0137e7e7aea5 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Sun, 15 Oct 2023 22:30:40 +0000 Subject: [PATCH 19/32] update makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 18993bf..4db333a 100644 --- a/Makefile +++ b/Makefile @@ -9,4 +9,7 @@ check: test: @./vendor/bin/pest --coverage --min=0 --coverage-clover ./coverage.xml +debug: + XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --coverage-html .log + From 2aeab4228a813232de701fef834744ab5be5bd96 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Thu, 19 Oct 2023 17:00:45 +0000 Subject: [PATCH 20/32] test: move bypass finals to checkout test --- src/Contract/ControllerInterface.php | 18 ++++++++++++++++++ tests/Unit/Service/CheckoutTest.php | 14 ++++++++++++++ tests/bootstrap.php | 20 ++++++++++---------- 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 src/Contract/ControllerInterface.php diff --git a/src/Contract/ControllerInterface.php b/src/Contract/ControllerInterface.php new file mode 100644 index 0000000..6cb9c2e --- /dev/null +++ b/src/Contract/ControllerInterface.php @@ -0,0 +1,18 @@ + Date: Thu, 19 Oct 2023 17:02:20 +0000 Subject: [PATCH 21/32] remove bypass finals --- tests/Unit/Service/CheckoutTest.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/Unit/Service/CheckoutTest.php b/tests/Unit/Service/CheckoutTest.php index e59afa2..b284e0d 100644 --- a/tests/Unit/Service/CheckoutTest.php +++ b/tests/Unit/Service/CheckoutTest.php @@ -14,16 +14,16 @@ use PHPUnit\Framework\TestCase; use DG\BypassFinals; -BypassFinals::enable(); -BypassFinals::setWhitelist( - [ - '*/src/Library/*', - // '*/src/Entities/*', - // '*/src/Factories/*', - // '*/src/HttpAdapter/*', - '*/src/Controller/*', - ] -); +// BypassFinals::enable(); +// BypassFinals::setWhitelist( +// [ +// '*/src/Library/*', +// // '*/src/Entities/*', +// // '*/src/Factories/*', +// // '*/src/HttpAdapter/*', +// '*/src/Controller/*', +// ] +// ); From cc738b36563355cf0c7113646eab0483f3cbffc0 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 18:12:25 +0000 Subject: [PATCH 22/32] replace the Config -> PackageConfig handle custom configurations using PackageConfig::setUp() --- src/Traits/Setup/Configure.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Traits/Setup/Configure.php b/src/Traits/Setup/Configure.php index 981fea9..214e373 100644 --- a/src/Traits/Setup/Configure.php +++ b/src/Traits/Setup/Configure.php @@ -6,21 +6,22 @@ use Flutterwave\Contract\ConfigInterface; use Flutterwave\Helper\Config; +use Flutterwave\Config\PackageConfig; use Flutterwave\Config\ForkConfig; trait Configure { public static function bootstrap(?ConfigInterface $config = null): void { - if (\is_null($config)) { + if (\is_null($config) && \is_null(self::$config)) { include __DIR__ . '/../../../setup.php'; if ('composer' === $flutterwave_installation) { - $config = Config::setUp( - $keys[Config::SECRET_KEY], - $keys[Config::PUBLIC_KEY], - $keys[Config::ENCRYPTION_KEY], - $keys[Config::ENV] + $config = PackageConfig::setUp( + $keys[PackageConfig::SECRET_KEY], + $keys[PackageConfig::PUBLIC_KEY], + $keys[PackageConfig::ENCRYPTION_KEY], + $keys[PackageConfig::ENV] ); } From 662222c3ee00d8a6752300fb3def873b44e13be6 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 18:14:07 +0000 Subject: [PATCH 23/32] test: separate checkout test --- .../{Service => Checkout}/CheckoutTest.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename tests/Unit/{Service => Checkout}/CheckoutTest.php (93%) diff --git a/tests/Unit/Service/CheckoutTest.php b/tests/Unit/Checkout/CheckoutTest.php similarity index 93% rename from tests/Unit/Service/CheckoutTest.php rename to tests/Unit/Checkout/CheckoutTest.php index b284e0d..1f2aac7 100644 --- a/tests/Unit/Service/CheckoutTest.php +++ b/tests/Unit/Checkout/CheckoutTest.php @@ -1,6 +1,6 @@ Date: Wed, 21 Feb 2024 18:50:04 +0000 Subject: [PATCH 24/32] fix: curlClient namespace --- src/HttpAdapter/CurlClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HttpAdapter/CurlClient.php b/src/HttpAdapter/CurlClient.php index 8fd34a5..bcd9ce6 100644 --- a/src/HttpAdapter/CurlClient.php +++ b/src/HttpAdapter/CurlClient.php @@ -1,6 +1,6 @@ Date: Wed, 21 Feb 2024 20:42:42 +0000 Subject: [PATCH 25/32] update: set default the default modal to standard on checkout the payment controller makes use of the flutterwave standard method by default --- processPayment.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/processPayment.php b/processPayment.php index 622ad36..0946145 100644 --- a/processPayment.php +++ b/processPayment.php @@ -9,15 +9,33 @@ use Flutterwave\EventHandlers\ModalEventHandler as PaymentHandler; use Flutterwave\Flutterwave; use Flutterwave\Library\Modal; +use \Flutterwave\Config\ForkConfig; -# start a session. +// start a session. session_start(); +// Define custom config. +// $myConfig = ForkConfig::setUp( +// 'FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X', //Secret key +// 'FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X', // Public key +// 'FLWSECK_TESTXXXXXXXXXXX', //Encryption key +// 'staging' //Environment Variable +// ); + +// uncomment the block if you just want to pass the keys with a specific configuration. +// $_ENV['SECRET_KEY'] = "FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X"; +// $_ENV['PUBLIC_KEY'] = "FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X"; +// $_ENV['ENCRYPTION_KEY'] = "FLWSECK_TESTXXXXXXXXXXXX"; +// $_ENV['ENV'] = "staging"; + +// controller default +$controller = null; + try { - Flutterwave::bootstrap(); + Flutterwave::bootstrap(); // create a .env or Flutterwave::bootstrap($myConfig) $customHandler = new PaymentHandler(); $client = new Flutterwave(); - $modalType = Modal::POPUP; // Modal::POPUP or Modal::STANDARD + $modalType = Modal::STANDARD; // Modal::POPUP or Modal::STANDARD $controller = new PaymentController( $client, $customHandler, $modalType ); } catch(\Exception $e ) { echo $e->getMessage(); From 65c6c2a8c92902a74d8b7f032e90b69fdcef9700 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 20:44:00 +0000 Subject: [PATCH 26/32] update setup script --- setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.php b/setup.php index b7e7078..88934ec 100644 --- a/setup.php +++ b/setup.php @@ -5,7 +5,7 @@ $flutterwave_installation = 'composer'; -if( !file_exists( '.env' )) { +if( !file_exists( '.env' ) && !is_dir('vendor')) { $dotenv = Dotenv::createImmutable(__DIR__."/../../../"); # on the event that the package is install via composer. } else { $flutterwave_installation = "manual"; From 238e83eb33d9f987004549bf3f9342e9c66b9d94 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 20:47:00 +0000 Subject: [PATCH 27/32] fix: handle config override This fix ensures that an existing configuration is not overriden --- src/Traits/Setup/Configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Traits/Setup/Configure.php b/src/Traits/Setup/Configure.php index 214e373..dcc7cf1 100644 --- a/src/Traits/Setup/Configure.php +++ b/src/Traits/Setup/Configure.php @@ -35,7 +35,7 @@ public static function bootstrap(?ConfigInterface $config = null): void } } - if (\is_null(self::$config)) { + if (\is_null(self::$config) && !\is_null($config)) { self::$config = $config; } From 43054338da955137a78414cb638b30d7e5d91bfe Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 20:57:37 +0000 Subject: [PATCH 28/32] tests: exclude vendor folder files --- phpunit.xml.dist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index fc42dbe..86240f3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -19,6 +19,12 @@ ./src + + ./vendor + ./vendor + ./vendor + tests/bootstrap.php + From cba70798939286e6dc2bfaa4a27a6acf203b7ce3 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju Date: Wed, 21 Feb 2024 21:50:10 +0000 Subject: [PATCH 29/32] refact: update card service array merge compatibility with 7.4 --- src/Service/CardPayment.php | 2 +- tests/Unit/Service/CardTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Service/CardPayment.php b/src/Service/CardPayment.php index b21430e..5ded64a 100644 --- a/src/Service/CardPayment.php +++ b/src/Service/CardPayment.php @@ -144,7 +144,7 @@ public function handleAuthState(\stdClass $response, $payload): array ['logger' => $this->logger, 'mode' => $mode] ); - return [ 'request_data' => $data['request_data'], ...$extra_data ]; + return array_merge([ 'request_data' => $data['request_data'] ], $extra_data); } public function getName(): string diff --git a/tests/Unit/Service/CardTest.php b/tests/Unit/Service/CardTest.php index 30fa0d3..ed77e5b 100644 --- a/tests/Unit/Service/CardTest.php +++ b/tests/Unit/Service/CardTest.php @@ -43,6 +43,7 @@ public function testAuthModeReturnPin() "email" => "ol868gjdfjua@gmail.com", "phone" => "+2349067985861" ]); + $data['customer'] = $customerObj; $payload = $cardpayment->payload->create($data); $result = $cardpayment->initiate($payload); From 6fce11c2d9be9edfe2d62f701fd8b7de7c07ffc2 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju <129767063+Abraham-Flutterwave@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:36:34 +0100 Subject: [PATCH 30/32] update Bill Service --- src/Service/Bill.php | 71 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/src/Service/Bill.php b/src/Service/Bill.php index 661cce5..6a562a8 100644 --- a/src/Service/Bill.php +++ b/src/Service/Bill.php @@ -15,8 +15,14 @@ class Bill extends Service protected ?array $categories = null; private string $name = 'bill-categories'; private array $requiredParams = [ - 'country','customer','amount','type','reference', + 'country', + 'customer_id', + 'amount', + 'reference', + 'biller_code', + 'item_code' ]; + public function __construct(?ConfigInterface $config = null) { parent::__construct($config); @@ -25,6 +31,7 @@ public function __construct(?ConfigInterface $config = null) /** * @throws ClientExceptionInterface + * @deprecated Use `getBillCategories()` instead. */ public function getCategories(): \stdClass { @@ -35,8 +42,39 @@ public function getCategories(): \stdClass return $response; } + /** + * This retrieves the categories of bills that can be paid for. + */ + public function getBillCategories(): \stdClass + { + $this->logger->notice('Bill Payment Service::Retrieving Top Categories.'); + self::startRecording(); + $response = $this->request(null, 'GET', "top-".$this->name); + self::setResponseTime(); + return $response; + } + + /** + * Retrieve items under a specific biller code. + */ + public function getBillerItems(string $biller_code = null): \stdClass + { + if(is_null($biller_code)) { + $msg = "The required parameter" . $biller_code . " is not present in payload"; + $this->logger->error("Bill Payment Service::$msg"); + throw new \InvalidArgumentException("Bill Payment Service:$msg"); + } + + $this->logger->notice('Bill Payment Service::Retrieving items under biller '. $biller_code); + self::startRecording(); + $response = $this->request(null, 'GET', sprintf('billers/%s/items', $biller_code)); + self::setResponseTime(); + return $response; + } + /** * @throws ClientExceptionInterface + * @deprecated Use `validateCustomerInfo()` instead. */ public function validateService(string $item_code): \stdClass { @@ -47,6 +85,30 @@ public function validateService(string $item_code): \stdClass return $response; } + public function validateCustomerInfo(\Flutterwave\Payload $payload): \stdClass + { + $payload = $payload->toArray(); + + foreach (['biller_code', 'customer', 'item_code'] as $param) { + if (! array_key_exists($param, $payload)) { + $msg = "The required parameter ". $param. " is not present in payload"; + $this->logger->error("Bill Payment Service::$msg"); + throw new \InvalidArgumentException("Bill Payment Service:$msg"); + } + } + + $code = $payload['biller_code']; + $customer = $payload['customer']; + $customer = $customer[0] == '+' ? substr($customer, 1) : $customer; + $item_code = $payload['item_code']; + + $this->logger->notice('Bill Payment Service::Retrieving all Plans.'); + self::startRecording(); + $response = $this->request(null, 'GET', sprintf("bill-items/{$item_code}/validate?code=%s&customer=%s", $code, $customer)); + self::setResponseTime(); + return $response; + } + /** * @throws ClientExceptionInterface */ @@ -55,7 +117,7 @@ public function createPayment(\Flutterwave\Payload $payload): \stdClass $payload = $payload->toArray(); foreach ($this->requiredParams as $param) { if (! array_key_exists($param, $payload)) { - $msg = 'The required parameter {$param} is not present in payload'; + $msg = "The required parameter ". $param. " is not present in payload"; $this->logger->error("Bill Payment Service::$msg"); throw new \InvalidArgumentException("Bill Payment Service:$msg"); } @@ -63,9 +125,12 @@ public function createPayment(\Flutterwave\Payload $payload): \stdClass $body = $payload; + $biller_code = $payload['biller_code']; + $item_code = $payload['item_code']; + $this->logger->notice('Bill Payment Service::Creating a Bill Payment.'); self::startRecording(); - $response = $this->request($body, 'POST', 'bills'); + $response = $this->request($body, 'POST', sprintf('billers/%s/items/%s/payment', $biller_code, $item_code)); $this->logger->notice('Bill Payment Service::Created a Bill Payment Successfully.'); self::setResponseTime(); return $response; From d142f28eacb93d325ea8dc64bf8469ccae7f6da5 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju <129767063+Abraham-Flutterwave@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:50:53 +0100 Subject: [PATCH 31/32] update: Payout Subaccount Event tracker --- src/Service/PayoutSubaccount.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Service/PayoutSubaccount.php b/src/Service/PayoutSubaccount.php index e63dcaf..493019d 100644 --- a/src/Service/PayoutSubaccount.php +++ b/src/Service/PayoutSubaccount.php @@ -8,20 +8,20 @@ use Flutterwave\EventHandlers\PayoutSubaccoutEventHandler; use Flutterwave\Payload; use Psr\Http\Client\ClientExceptionInterface; +use Flutterwave\EventHandlers\EventTracker; use stdClass; class PayoutSubaccount extends Service { + use EventTracker; private string $name = 'payout-subaccounts'; private array $requiredParams = [ 'email', 'mobilenumber','country' ]; - private PayoutSubaccoutEventHandler $eventHandler; public function __construct(?ConfigInterface $config = null) { parent::__construct($config); $endpoint = $this->name; $this->url = $this->baseUrl . '/' . $endpoint; - $this->eventHandler = new PayoutSubaccoutEventHandler(); } public function confirmPayload(Payload $payload): array @@ -51,9 +51,9 @@ public function create(Payload $payload): stdClass $this->logger->notice('PSA Service::Creating new Payout Subaccount.'); $body = $this->confirmPayload($payload); $this->logger->notice('PSA Service::Payload Confirmed.'); - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request($body, 'POST'); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -62,9 +62,9 @@ public function create(Payload $payload): stdClass */ public function list(): stdClass { - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request(null, 'GET'); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -73,9 +73,9 @@ public function list(): stdClass */ public function get(string $account_reference): \stdClass { - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request(null, 'GET', "/$account_reference"); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -90,9 +90,9 @@ public function update(string $account_reference, Payload $payload): \stdClass throw new \InvalidArgumentException($msg); } - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request($payload->toArray(), 'PUT', "/{$account_reference}"); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -101,9 +101,9 @@ public function update(string $account_reference, Payload $payload): \stdClass */ public function fetchTransactions(string $account_reference): \stdClass { - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request(null, 'GET', "/{$account_reference}/transactions"); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -112,9 +112,9 @@ public function fetchTransactions(string $account_reference): \stdClass */ public function fetchAvailableBalance(string $account_reference, string $currency = 'NGN'): \stdClass { - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request(null, 'GET', "/{$account_reference}/balances?currency={$currency}"); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } @@ -123,9 +123,9 @@ public function fetchAvailableBalance(string $account_reference, string $currenc */ public function fetchStaticVirtualAccounts(string $account_reference, string $currency = 'NGN'): stdClass { - $this->eventHandler::startRecording(); + self::startRecording(); $response = $this->request(null, 'GET', "/{$account_reference}/static-account?currency={$currency}"); - $this->eventHandler::setResponseTime(); + self::setResponseTime(); return $response; } } From ab0b23bf6b926a9a75bebbeb56b6a67ac72fa088 Mon Sep 17 00:00:00 2001 From: Abraham Olaobaju <129767063+Abraham-Flutterwave@users.noreply.github.com> Date: Wed, 2 Apr 2025 19:06:58 +0100 Subject: [PATCH 32/32] FTPI-1072: handle final card status responses. --- src/Service/CardPayment.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Service/CardPayment.php b/src/Service/CardPayment.php index 5ded64a..faadfb4 100644 --- a/src/Service/CardPayment.php +++ b/src/Service/CardPayment.php @@ -132,19 +132,27 @@ public function encryption(string $params): string public function handleAuthState(\stdClass $response, $payload): array { // dd($response); - $data['request_data'] = null; + if(property_exists( $response, 'data' ) && property_exists( $response->data, 'status' ) && $response->data->status === 'successful') { + return [ + 'card_info' => $response->data->card, + 'transaction_id' => $response->data->id, + 'reference' => $response->data->tx_ref, + 'amount' => $response->data->amount, + 'mode' => $response->data->auth_model, + 'currency' => $response->data->currency, + 'customer' => $response->data->customer, + 'fraud_status' => $response->data->fraud_status + ]; + } - $mode = (\property_exists($response, 'meta') ) ? - $response->meta->authorization->mode: $response->data->auth_model; + $mode = $response->meta->authorization->mode; if ($mode === 'pin') { + $data = $this->eventHandler->onAuthorization($response, ['logger' => $this->logger]); $data['request_data'] = $payload; + return $data; } - $extra_data = $this->eventHandler->onAuthorization( - $response, - ['logger' => $this->logger, 'mode' => $mode] - ); - - return array_merge([ 'request_data' => $data['request_data'] ], $extra_data); + + return $this->eventHandler->onAuthorization($response, ['logger' => $this->logger]); } public function getName(): string