AppBridge : Add the host param to the billing redirect url (#1244)

gnikyt · Nov 10, 2022 · 695f968 · 695f968
1 parent 31ff8ea
commit 695f968
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
             laravel: '9.0'
         include:
           - php: '8.0'
-            laravel: '9.0'
+            laravel: '9.39.0'
             analysis: true
             coverage: 'xdebug'
             normalize: true

diff --git a/src/Traits/BillingController.php b/src/Traits/BillingController.php
@@ -80,6 +80,7 @@ public function process(
         if (!$request->has('charge_id')) {
             return Redirect::route(Util::getShopifyConfig('route_names.home'), [
                 'shop' => $shop->getDomain()->toNative(),
+                'host' => base64_encode($shop->getDomain()->toNative().'/admin'),
             ]);
         }
         // Activate the plan and save
@@ -92,6 +93,8 @@ public function process(
         // Go to homepage of app
         return Redirect::route(Util::getShopifyConfig('route_names.home'), [
             'shop' => $shop->getDomain()->toNative(),
+            'host' => base64_encode($shop->getDomain()->toNative().'/admin'),
+            'billing' => $result ? 'success' : 'failure',
         ])->with(
             $result ? 'success' : 'failure',
             'billing'

diff --git a/tests/Traits/BillingControllerTest.php b/tests/Traits/BillingControllerTest.php
@@ -3,6 +3,7 @@
 namespace Osiset\ShopifyApp\Test\Traits;
 
 use Illuminate\Auth\AuthManager;
+use Illuminate\Support\Str;
 use Osiset\ShopifyApp\Exceptions\MissingShopDomainException;
 use Osiset\ShopifyApp\Storage\Models\Charge;
 use Osiset\ShopifyApp\Storage\Models\Plan;
@@ -78,8 +79,11 @@ public function testShopAcceptsBilling(): void
         // Refresh the model
         $shop->refresh();
 
+        $hostValue = urlencode(base64_encode($shop->getDomain()->toNative().'/admin'));
         // Assert we've redirected and shop has been updated
         $response->assertRedirect();
+        $this->assertTrue(Str::contains($response->headers->get('Location'), '&host='.$hostValue));
+        $this->assertTrue(Str::contains($response->headers->get('Location'), '&billing=success'));
         $this->assertNotNull($shop->plan);
     }
 
@@ -148,7 +152,8 @@ public function testReturnToSettingScreenNoPlan(): void
             ['shop' => $shop->name]
         );
         //Confirm we get sent back to the homepage of the app
-        $response->assertRedirect('https://example-app.com?shop='.$shop->name);
+        $hostValue = urlencode(base64_encode($shop->getDomain()->toNative().'/admin'));
+        $response->assertRedirect('https://example-app.com?shop='.$shop->name.'&host='.$hostValue);
     }
 
     public function testUsageChargeSuccessWithShopParam(): void