Update AuthController.php (#873)

Turbulinks fixes
gnikyt · Jul 9, 2021 · 128dae7 · 128dae7
1 parent 4cbc2d2
commit 128dae7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/ShopifyApp/Traits/AuthController.php b/src/ShopifyApp/Traits/AuthController.php
@@ -27,12 +27,13 @@ trait AuthController
     public function authenticate(Request $request, AuthenticateShop $authShop)
     {
         // Get the shop domain
-        if (Util::getShopifyConfig('turbo_enabled') && $request->user()) {
-            // If the user clicked on any link before load Turbo and receiving the token
-            $shopDomain = $request->user()->getDomain();
+        $shopDomain = $request->has('shop')
+            ? ShopDomain::fromNative($request->get('shop'))
+            : $request->user()->getDomain();
+
+        // If the domain is obtained from $request->user()
+        if ($request->missing('shop')) {
             $request['shop'] = $shopDomain->toNative();
-        } else {
-            $shopDomain = ShopDomain::fromNative($request->get('shop'));
         }
 
         // Run the action