refactor(AppFramework): Improve strict and lax cookie checks

Signed-off-by: provokateurin <kate@provokateurin.de>

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index af3993df8bddc256ba05c7f621fba1cefcd6db4d..36dec2e1d7c48490870d5a45054c197670242183 100644 (file)
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -532,11 +532,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                }
 
                $cookieName = $this->getProtectedCookieName('nc_sameSiteCookiestrict');
-               if ($this->getCookie($cookieName) === 'true'
-                       && $this->passesLaxCookieCheck()) {
-                       return true;
-               }
-               return false;
+               return $this->getCookie($cookieName) === 'true' && $this->passesLaxCookieCheck();
        }
 
        /**
@@ -552,10 +548,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                }
 
                $cookieName = $this->getProtectedCookieName('nc_sameSiteCookielax');
-               if ($this->getCookie($cookieName) === 'true') {
-                       return true;
-               }
-               return false;
+               return $this->getCookie($cookieName) === 'true';
        }