Added read shop from referrer if everything fails

src/ShopifyApp/Services/ApiHelper.php

@@ -21,6 +21,7 @@
 use Osiset\ShopifyApp\Objects\Transfers\PlanDetails as PlanDetailsTransfer;
 use Osiset\ShopifyApp\Objects\Transfers\UsageChargeDetails as UsageChargeDetailsTransfer;
 use Osiset\ShopifyApp\Objects\Values\ChargeReference;
+use Osiset\ShopifyApp\Objects\Values\ShopDomain;
 
 /**
  * Basic helper class for API calls to Shopify.
@@ -42,7 +43,7 @@ public function make(Session $session = null): self
         // Create the options
         $opts = new Options();
 
-        $shop = $session ? $session->getShop() : Arr::get(Request::all(), 'shop');
+        $shop = $this->getShop($session)->toNative();
         $opts->setApiKey(getShopifyConfig('api_key', $shop));
         $opts->setApiSecret(getShopifyConfig('api_secret', $shop));
         $opts->setVersion(getShopifyConfig('api_version', $shop));
@@ -470,4 +471,33 @@ protected function doRequestGraphQL(string $query, array $payload = null)
 
         return $response;
     }
+
+    /**
+     * @param  Session  $session
+     * @throws \InvalidArgumentException
+     * @return ShopDomain
+     */
+    private function getShop(Session $session = null)
+    {
+        $shop = '';
+        if ($session && $session->getShop()) {
+            $shop = $session->getShop();
+        }
+
+        if (! $shop) {
+            $shop = Arr::get(Request::all(), 'shop');
+        }
+
+        if (! $shop) {
+            $refererQueryParams = [];
+            parse_str(Request::server('HTTP_REFERER'), $refererQueryParams);
+            $shop = Arr::get($refererQueryParams, 'shop');
+        }
+
+        if (! $shop) {
+            $shop = Request::header('X-Shop-Domain');
+        }
+
+        return is_a($shop, 'Osiset\ShopifyApp\Objects\Values\ShopDomain') ? $shop : ShopDomain::fromNative((string) $shop);
+    }
 }

src/ShopifyApp/resources/views/layouts/default.blade.php

@@ -23,7 +23,7 @@
                 var AppBridge = window['app-bridge'];
                 var createApp = AppBridge.default;
                 var app = createApp({
-                    apiKey: '{{ \Osiset\ShopifyApp\getShopifyConfig('api_key') }}',
+                    apiKey: '{{ \Osiset\ShopifyApp\getShopifyConfig('api_key', Auth::user()->name ) }}',
                     shopOrigin: '{{ Auth::user()->name }}',
                     forceRedirect: true,
                 });
@@ -34,4 +34,4 @@
 
         @yield('scripts')
     </body>
-</html>
+</html>