Vipps class is redunant, use Client directly

zaporylie · Jul 30, 2024 · 94f8a58 · 94f8a58
1 parent 2c22a48
commit 94f8a58
Show file tree

Hide file tree

Showing 52 changed files with 365 additions and 425 deletions.
diff --git a/examples/authorization/01-token.php b/examples/authorization/01-token.php
@@ -6,14 +6,14 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-        'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-         ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $result = $authorization->getToken($settings['client_secret']);
     echo '<pre>';
     var_dump($result);

diff --git a/examples/checkout/01-checkout-create.php b/examples/checkout/01-checkout-create.php
@@ -12,20 +12,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
-        'http_client' => $http_client,
-        'vipps_system_name' => 'vipps_zaporylie_example',
-        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
-    ]);
+$http_client = new \GuzzleHttp\Client();
+$client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+    'http_client' => $http_client,
+    'vipps_system_name' => 'vipps_zaporylie_example',
+    'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $checkout = new \zaporylie\Vipps\Api\v3\Checkout($vipps, $settings['subscription_key'], $settings['merchant_serial_number'], $settings['client_secret']);
+    $checkout = new \zaporylie\Vipps\Api\v3\Checkout($client, $settings['subscription_key'], $settings['merchant_serial_number'], $settings['client_secret']);
     $request = new \zaporylie\Vipps\Model\Checkout\v3\CreateCheckoutSessionRequest();
     $request->setType('PAYMENT');
     $request->setMerchantInfo((new \zaporylie\Vipps\Model\Checkout\v3\MerchantInfo())

diff --git a/examples/payment/01-epayment-init.php b/examples/payment/01-epayment-init.php
@@ -7,15 +7,15 @@
 
 try {
     $http_client = new \GuzzleHttp\Client();
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
         'http_client' => $http_client,
         'vipps_system_name' => 'vipps_zaporylie_example',
         'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
     ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\EPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\EPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->createPayment((new \zaporylie\Vipps\Model\EPayment\v1\CreatePaymentRequest())
         ->setAmount((new \zaporylie\Vipps\Model\EPayment\v1\Amount())->setValue(1000)->setCurrency('NOK'))
         ->setPaymentMethod((new \zaporylie\Vipps\Model\EPayment\v1\PaymentMethod())->setType('WALLET'))

diff --git a/examples/payment/02-epayment-get.php b/examples/payment/02-epayment-get.php
@@ -11,11 +11,15 @@
             'Merchant-Serial-Number' => $settings['merchant_serial_number'],
         ]]
     );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\EPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\EPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->getPayment('test-12121212-4');
     echo '<pre>';
     var_dump($result);

diff --git a/examples/payment/03-epayment-adjust-cancel.php b/examples/payment/03-epayment-adjust-cancel.php
@@ -6,16 +6,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\EPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\EPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->cancelPayment('test-12121212-3', new \zaporylie\Vipps\Model\EPayment\v1\CancelModificationRequest(), 'costam');
     echo '<pre>';
     var_dump($result);

diff --git a/examples/payment/04-epayment-adjust-modify.php b/examples/payment/04-epayment-adjust-modify.php
@@ -6,16 +6,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\EPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\EPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->capturePayment('test-12121212-3', (new \zaporylie\Vipps\Model\EPayment\v1\CaptureModificationRequest())->setModificationAmount((new \zaporylie\Vipps\Model\EPayment\v1\Amount())->setCurrency('NOK')->setValue(101)), 'costam3');
     echo '<pre>';
     var_dump($result);

diff --git a/examples/recurring_payment/01-recurring-payment-create.php b/examples/recurring_payment/01-recurring-payment-create.php
@@ -7,19 +7,18 @@
 
 try {
     $http_client = new \GuzzleHttp\Client();
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
         'http_client' => $http_client,
         'vipps_system_name' => 'vipps_zaporylie_example',
         'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
     ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->createAgreement((new \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement())
         ->setPricing((new \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing())
             ->setCurrency('NOK')
-            ->setType('FLEXIBLE')
             ->setAmount(1000))
         ->setMerchantRedirectUrl('https://eoncxehuh2o2qyq.m.pipedream.net')
         ->setMerchantAgreementUrl('https://eoncxehuh2o2qyq.m.pipedream.net')

diff --git a/examples/recurring_payment/01-recurring-payment-get.php b/examples/recurring_payment/01-recurring-payment-get.php
@@ -7,15 +7,15 @@
 
 try {
     $http_client = new \GuzzleHttp\Client();
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
         'http_client' => $http_client,
         'vipps_system_name' => 'vipps_zaporylie_example',
         'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
     ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->getAgreement('agr_KG6k3X3');
     echo '<pre>';
     var_dump($result);

diff --git a/examples/recurring_payment/02-recurring-payment-create-charge.php b/examples/recurring_payment/02-recurring-payment-create-charge.php
@@ -7,15 +7,15 @@
 
 try {
     $http_client = new \GuzzleHttp\Client();
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
         'http_client' => $http_client,
         'vipps_system_name' => 'vipps_zaporylie_example',
         'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
     ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->createCharge('agr_KG6k3X3', (new \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge())
         ->setAmount(1000)
         ->setDescription('Ok, that worked')

diff --git a/examples/recurring_payment/02-recurring-payment-get-charge.php b/examples/recurring_payment/02-recurring-payment-get-charge.php
@@ -7,15 +7,15 @@
 
 try {
     $http_client = new \GuzzleHttp\Client();
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], [
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
         'http_client' => $http_client,
         'vipps_system_name' => 'vipps_zaporylie_example',
         'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
     ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v3\RecurringPayment($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->getCharge('agr_KG6k3X3','chr-gTHPbNE');
     echo '<pre>';
     var_dump($result);

diff --git a/examples/webhook/01-webhook-get.php b/examples/webhook/01-webhook-get.php
@@ -6,16 +6,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\Webhook($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\Webhook($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $result = $payment->getWebhooks();
     echo '<pre>';
     var_dump($result);

diff --git a/examples/webhook/02-webhook-register.php b/examples/webhook/02-webhook-register.php
@@ -6,16 +6,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\Webhook($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\Webhook($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $request = new \zaporylie\Vipps\Model\Webhook\v1\RegisterWebhookRequest();
     $request->setUrl("https://eoncxehuh2o2qyq.m.pipedream.net/");
     $request->setEvents([

diff --git a/examples/webhook/03-webhook-delete.php b/examples/webhook/03-webhook-delete.php
@@ -6,16 +6,16 @@
 $settings = \Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__.'/../config.yml'));
 
 try {
-    $http_client = new \GuzzleHttp\Client(
-        ['headers' => [
-            'Merchant-Serial-Number' => $settings['merchant_serial_number'],
-        ]]
-    );
-    $client = new \zaporylie\Vipps\Client($settings['client_id'], ['http_client' => $http_client]);
+    $http_client = new \GuzzleHttp\Client();
+    $client = new \zaporylie\Vipps\Client($settings['client_id'], $settings['client_secret'], $settings['subscription_key'], $settings['merchant_serial_number'], [
+        'http_client' => $http_client,
+        'vipps_system_name' => 'vipps_zaporylie_example',
+        'vipps_system_version' => \zaporylie\Vipps\Client::VERSION,
+    ]);
     $vipps = new \zaporylie\Vipps\Vipps($client);
-    $authorization = new \zaporylie\Vipps\Api\Authorization($vipps, $settings['subscription_key']);
+    $authorization = new \zaporylie\Vipps\Api\Authorization($client, $settings['subscription_key']);
     $authorization->getToken($settings['client_secret']);
-    $payment = new \zaporylie\Vipps\Api\v1\Webhook($vipps, $settings['subscription_key'], $settings['merchant_serial_number']);
+    $payment = new \zaporylie\Vipps\Api\v1\Webhook($client, $settings['subscription_key'], $settings['merchant_serial_number']);
     $payment->deleteWebhook('1aaf0fde-afed-43c0-9af3-b876bba34e48');
     echo 'ok';
 

diff --git a/src/Api/ApiBase.php b/src/Api/ApiBase.php
@@ -2,32 +2,25 @@
 
 namespace zaporylie\Vipps\Api;
 
+use zaporylie\Vipps\ClientInterface;
 use zaporylie\Vipps\Exceptions\Api\InvalidArgumentException;
-use zaporylie\Vipps\VippsInterface;
 
 abstract class ApiBase
 {
 
     /**
-     * @var \zaporylie\Vipps\VippsInterface
+     * @var \zaporylie\Vipps\ClientInterface
      */
-    protected $app;
-
-    /**
-     * @var string
-     */
-    protected $subscriptionKey;
+    protected $client;
 
     /**
      * ApiBase constructor.
      *
-     * @param \zaporylie\Vipps\VippsInterface $app
-     * @param string $subscription_key
+     * @param \zaporylie\Vipps\ClientInterface $client
      */
-    public function __construct(VippsInterface $app, $subscription_key)
+    public function __construct(ClientInterface $client)
     {
-        $this->app = $app;
-        $this->subscriptionKey = $subscription_key;
+        $this->client = $client;
     }
 
     /**

diff --git a/src/Api/Authorization.php b/src/Api/Authorization.php
@@ -15,13 +15,13 @@ class Authorization extends ApiBase implements AuthorizationInterface
     public function getToken($client_secret)
     {
         // Initiate GetToken resource.
-        $resource = new GetToken($this->app, $this->getSubscriptionKey(), $client_secret);
+        $resource = new GetToken($this->client, $client_secret);
 
         /** @var \zaporylie\Vipps\Model\Authorization\ResponseGetToken $response */
         $response = $resource->call();
 
         // Save token on Client for future use.
-        $this->app->getClient()->getTokenStorage()->set($response);
+        $this->client->getTokenStorage()->set($response);
 
         return $response;
     }