Merge branch 'optimize-conditions' of git://github.com/lucasmichot/laravel-shopify into lucasmichot-optimize-conditions

Tyler King · Tyler King · commit ce737750ffa9 · 2021-07-12T13:20:07.000-02:30
diff --git a/src/Http/Middleware/AuthProxy.php b/src/Http/Middleware/AuthProxy.php
@@ -74,7 +74,7 @@ public function handle(Request $request, Closure $next)
             ],
             Util::getShopifyConfig('api_secret', $shop)
         );
-        if (! Hmac::fromNative($signature)->isSame($signatureLocal) || $shop->isNull()) {
+        if ($shop->isNull() || ! Hmac::fromNative($signature)->isSame($signatureLocal)) {
             // Issue with HMAC or missing shop header
             return Response::make('Invalid proxy signature.', HttpResponse::HTTP_UNAUTHORIZED);
         }
diff --git a/src/Http/Middleware/Billable.php b/src/Http/Middleware/Billable.php
@@ -26,7 +26,7 @@ public function handle(Request $request, Closure $next)
         if (Util::getShopifyConfig('billing_enabled') === true) {
             /** @var $shop IShopModel */
             $shop = auth()->user();
-            if (! $shop->isFreemium() && ! $shop->isGrandfathered() && ! $shop->plan) {
+            if (! $shop->plan && ! $shop->isFreemium() && ! $shop->isGrandfathered()) {
                 // They're not grandfathered in, and there is no charge or charge was declined... redirect to billing
                 return Redirect::route(
                     Util::getShopifyConfig('route_names.billing'),
diff --git a/src/Services/CookieHelper.php b/src/Services/CookieHelper.php
@@ -67,23 +67,21 @@ public function checkSameSiteNoneCompatible(): bool
         $browser = $this->getBrowserDetails();
         $platform = $this->getPlatformDetails();
 
-        if ($this->agent->is('Chrome') && $browser['major'] >= 67) {
+        if ($browser['major'] >= 67 && $this->agent->is('Chrome')) {
             $compatible = true;
         }
 
-        if ($this->agent->is('iOS') && $platform['major'] > 12) {
+        if ($platform['major'] > 12 && $this->agent->is('iOS')) {
             $compatible = true;
         }
 
-        if ($this->agent->is('OS X') && $this->agent->is('Safari') && ! $this->agent->is('iOS') &&
-            $platform['float'] > 10.14
+        if ($platform['float'] > 10.14 &&
+            $this->agent->is('OS X') && $this->agent->is('Safari') && ! $this->agent->is('iOS')
         ) {
             $compatible = true;
         }
 
-        if ($this->agent->is('UCBrowser') &&
-            $browser['float'] > 12.13
-        ) {
+        if ($browser['float'] > 12.13 && $this->agent->is('UCBrowser')) {
             $compatible = true;
         }
 
diff --git a/src/resources/views/partials/flash_messages.blade.php b/src/resources/views/partials/flash_messages.blade.php
@@ -2,15 +2,15 @@
     document.addEventListener('DOMContentLoaded', function () {
         var Toast = actions.Toast;
 
-        @if (request()->has('notice') || isset($flashNotice))
+        @if (isset($flashNotice) || request()->has('notice'))
             var toastNotice = Toast.create(app, {
                 message: "{{ request()->get('notice', $flashNotice ?? null) }}",
                 duration: 3000,
             });
             toastNotice.dispatch(Toast.Action.SHOW);
         @endif
 
-        @if (request()->has('error') || isset($flashError))
+        @if (isset($flashError) || request()->has('error'))
             var toastNotice = Toast.create(app, {
                 message: "{{ request()->get('error', $flashError ?? null) }}",
                 duration: 3000,

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function handle(Request $request, Closure $next)`
`74`	`74`	`],`
`75`	`75`	`Util::getShopifyConfig('api_secret', $shop)`
`76`	`76`	`);`
`77`		`- if (! Hmac::fromNative($signature)->isSame($signatureLocal) \|\| $shop->isNull()) {`
	`77`	`+ if ($shop->isNull() \|\| ! Hmac::fromNative($signature)->isSame($signatureLocal)) {`
`78`	`78`	`// Issue with HMAC or missing shop header`
`79`	`79`	`return Response::make('Invalid proxy signature.', HttpResponse::HTTP_UNAUTHORIZED);`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,23 +67,21 @@ public function checkSameSiteNoneCompatible(): bool`
`67`	`67`	`$browser = $this->getBrowserDetails();`
`68`	`68`	`$platform = $this->getPlatformDetails();`
`69`	`69`
`70`		`- if ($this->agent->is('Chrome') && $browser['major'] >= 67) {`
	`70`	`+ if ($browser['major'] >= 67 && $this->agent->is('Chrome')) {`
`71`	`71`	`$compatible = true;`
`72`	`72`	`}`
`73`	`73`
`74`		`- if ($this->agent->is('iOS') && $platform['major'] > 12) {`
	`74`	`+ if ($platform['major'] > 12 && $this->agent->is('iOS')) {`
`75`	`75`	`$compatible = true;`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ($this->agent->is('OS X') && $this->agent->is('Safari') && ! $this->agent->is('iOS') &&`
`79`		`- $platform['float'] > 10.14`
	`78`	`+ if ($platform['float'] > 10.14 &&`
	`79`	`+ $this->agent->is('OS X') && $this->agent->is('Safari') && ! $this->agent->is('iOS')`
`80`	`80`	`) {`
`81`	`81`	`$compatible = true;`
`82`	`82`	`}`
`83`	`83`
`84`		`- if ($this->agent->is('UCBrowser') &&`
`85`		`- $browser['float'] > 12.13`
`86`		`- ) {`
	`84`	`+ if ($browser['float'] > 12.13 && $this->agent->is('UCBrowser')) {`
`87`	`85`	`$compatible = true;`
`88`	`86`	`}`
`89`	`87`