Merge pull request Shopify#65 from Shopify/update_shopify_api

paulomarg · web-flow · commit 076684122cc2 · 2021-11-30T11:56:53.000-05:00
Updating shopify-api to v1.0.1
diff --git a/app/Lib/CookieHandler.php b/app/Lib/CookieHandler.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Lib;
+
+use Illuminate\Support\Facades\Cookie;
+use Shopify\Auth\OAuthCookie;
+use Shopify\Context;
+
+class CookieHandler
+{
+    public static function saveShopifyCookie(OAuthCookie $cookie)
+    {
+        Cookie::queue(
+            $cookie->getName(),
+            $cookie->getValue(),
+            $cookie->getExpire() ? ceil(($cookie->getExpire() - time()) / 60) : null,
+            '/',
+            Context::$HOST_NAME,
+            $cookie->isSecure(),
+            $cookie->isHttpOnly(),
+            false,
+            'Lax'
+        );
+
+        return true;
+    }
+}
diff --git a/composer.lock b/composer.lock
diff --git a/routes/web.php b/routes/web.php
@@ -3,7 +3,6 @@
 use App\Models\Session;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Shopify\Auth\OAuth;
@@ -65,27 +64,18 @@
         $shop,
         '/auth/callback',
         true,
-        function (Shopify\Auth\OAuthCookie $cookie) {
-            Cookie::queue(
-                $cookie->getName(),
-                $cookie->getValue(),
-                ceil(($cookie->getExpire() - time()) / 60),
-                '/',
-                Context::$HOST_NAME,
-                $cookie->isSecure(),
-                $cookie->isHttpOnly(),
-                false,
-                'Lax'
-            );
-            return true;
-        }
+        ['App\Lib\CookieHandler', 'saveShopifyCookie'],
     );
 
     return redirect($installUrl);
 });
 
 Route::get('/auth/callback', function (Request $request) {
-    $session = OAuth::callback($request->cookie(), $request->query());
+    $session = OAuth::callback(
+        $request->cookie(),
+        $request->query(),
+        ['App\Lib\CookieHandler', 'saveShopifyCookie'],
+    );
 
     $host = $request->query('host');
     $shop = Utils::sanitizeShopDomain($request->query('shop'));
