Backport fix for issue #56

gnikyt · Jul 24, 2018 · af09780 · af09780
1 parent 7acc855
commit af09780
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/ShopifyApp/Middleware/AuthProxy.php b/src/ShopifyApp/Middleware/AuthProxy.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use OhMyBrew\ShopifyApp\Facades\ShopifyApp;
 
 class AuthProxy
 {
@@ -39,6 +40,9 @@ public function handle(Request $request, Closure $next)
             abort(401, 'Invalid proxy signature');
         }
 
+        // Save shop domain to session
+        session(['shopify_domain' => ShopifyApp::sanitizeShopDomain(request('shop'))]);
+
         // All good, process proxy request
         return $next($request);
     }

diff --git a/tests/Middleware/AuthProxyMiddlewareTest.php b/tests/Middleware/AuthProxyMiddlewareTest.php
@@ -3,6 +3,7 @@
 namespace OhMyBrew\ShopifyApp\Test\Middleware;
 
 use Illuminate\Support\Facades\Input;
+use OhMyBrew\ShopifyApp\Facades\ShopifyApp;
 use OhMyBrew\ShopifyApp\Middleware\AuthProxy;
 use OhMyBrew\ShopifyApp\Test\TestCase;
 
@@ -47,13 +48,19 @@ public function testDenysForMissingShop()
     public function testRuns()
     {
         Input::merge($this->queryParams);
-
+        // Confirm no shop
+        $this->assertEquals(null, session('shopify_domain'));
         $called = false;
         (new AuthProxy())->handle(request(), function ($request) use (&$called) {
             // Should be called
             $called = true;
+            // Session should be set by now
+            $this->assertEquals($this->queryParams['shop'], session('shopify_domain'));
+            // Shop should be callable
+            $shop = ShopifyApp::shop();
+            $this->assertEquals($this->queryParams['shop'], $shop->shopify_domain);
         });
-
+        // Confirm full run
         $this->assertEquals(true, $called);
     }