Subscription and Product facades can supply custom client on initialization

Author: imdhemy

composer.json

@@ -21,7 +21,7 @@
         "php": ">=7.1",
         "ext-json": "*",
         "imdhemy/appstore-iap": "^0.3",
-        "imdhemy/google-play-billing": "^0.3",
+        "imdhemy/google-play-billing": "^0.6",
         "nesbot/carbon": "^2.41"
     },
     "require-dev": {

src/Facades/Product.php

@@ -3,10 +3,11 @@
 
 namespace Imdhemy\Purchases\Facades;
 
+use GuzzleHttp\ClientInterface;
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static \Imdhemy\Purchases\Product googlePlay()
+ * @method static \Imdhemy\Purchases\Product googlePlay(?ClientInterface $client = null)
  * @method static \Imdhemy\Purchases\Product appStore()
  */
 class Product extends Facade

src/Facades/Subscription.php

@@ -3,10 +3,11 @@
 
 namespace Imdhemy\Purchases\Facades;
 
+use GuzzleHttp\ClientInterface;
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static \Imdhemy\Purchases\Subscription googlePlay()
+ * @method static \Imdhemy\Purchases\Subscription googlePlay(?ClientInterface $client = null)
  * @method static \Imdhemy\Purchases\Subscription appStore()
  */
 class Subscription extends Facade

src/Product.php

@@ -4,8 +4,10 @@
 namespace Imdhemy\Purchases;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use Imdhemy\AppStore\ClientFactory as AppStoreClientFactory;
+use Imdhemy\AppStore\Exceptions\InvalidReceiptException;
 use Imdhemy\AppStore\Receipts\ReceiptResponse;
 use Imdhemy\AppStore\Receipts\Verifier;
 use Imdhemy\GooglePlay\ClientFactory as GooglePlayClientFactory;
@@ -45,11 +47,12 @@ class Product
     protected $password;
 
     /**
+     * @param ClientInterface|null $client
      * @return self
      */
-    public function googlePlay(): self
+    public function googlePlay(?ClientInterface $client = null): self
     {
-        $this->client = GooglePlayClientFactory::create([GooglePlayClientFactory::SCOPE_ANDROID_PUBLISHER]);
+        $this->client = $client ?? GooglePlayClientFactory::create([GooglePlayClientFactory::SCOPE_ANDROID_PUBLISHER]);
         $this->packageName = config('purchase.google_play_package_name');
 
         return $this;
@@ -121,7 +124,7 @@ public function acknowledge(?string $developerPayload = null): void
 
     /**
      * @return ReceiptResponse
-     * @throws GuzzleException
+     * @throws GuzzleException|InvalidReceiptException
      */
     public function verifyReceipt(): ReceiptResponse
     {

src/Subscription.php

@@ -4,6 +4,7 @@
 namespace Imdhemy\Purchases;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use Imdhemy\AppStore\ClientFactory as AppStoreClientFactory;
 use Imdhemy\AppStore\Exceptions\InvalidReceiptException;
@@ -69,12 +70,13 @@ class Subscription
     protected $isGoogle = false;
 
     /**
+     * @param ClientInterface|null $client
      * @return self
      */
-    public function googlePlay(): self
+    public function googlePlay(?ClientInterface $client = null): self
     {
         $this->isGoogle = true;
-        $this->client = GooglePlayClientFactory::create([GooglePlayClientFactory::SCOPE_ANDROID_PUBLISHER]);
+        $this->client = $client ?? GooglePlayClientFactory::create([GooglePlayClientFactory::SCOPE_ANDROID_PUBLISHER]);
         $this->packageName = config('purchase.google_play_package_name');
 
         return $this;

tests/Facades/SubscriptionTest.php

@@ -2,9 +2,11 @@
 
 namespace Imdhemy\Purchases\Tests\Facades;
 
+use Exception;
 use GuzzleHttp\Exception\GuzzleException;
 use Imdhemy\AppStore\Exceptions\InvalidReceiptException;
 use Imdhemy\AppStore\Receipts\ReceiptResponse;
+use Imdhemy\GooglePlay\ClientFactory;
 use Imdhemy\GooglePlay\Subscriptions\SubscriptionPurchase;
 use Imdhemy\Purchases\Contracts\SubscriptionContract;
 use Imdhemy\Purchases\Facades\Subscription;
@@ -93,4 +95,26 @@ public function test_it_handles_the_21007_error_from_the_app_store()
         $response = Subscription::appStore()->receiptData($receiptData)->password($password)->verifyRenewable();
         $this->assertTrue($response->getStatus()->isValid());
     }
+
+    /**
+     * @test
+     * @throws Exception
+     * @throws GuzzleException
+     */
+    public function test_custom_client_can_be_set_on_google_play()
+    {
+        $jsonStream = file_get_contents(__DIR__ . '/../../google-app-credentials.json');
+        $jsonKey = json_decode($jsonStream, true);
+        $client = ClientFactory::createWithJsonKey($jsonKey, [ClientFactory::SCOPE_ANDROID_PUBLISHER]);
+        $subscription = Subscription::googlePlay($client)
+            ->packageName('com.twigano.fashion')
+            ->id($this->itemId)
+            ->token($this->token);
+
+        $getResponse = $subscription->get();
+        $stdSubscription = $subscription->toStd();
+
+        $this->assertInstanceOf(SubscriptionPurchase::class, $getResponse);
+        $this->assertInstanceOf(SubscriptionContract::class, $stdSubscription);
+    }
 }