Improving checking the customer wishlist

Author: eduard13

app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php

@@ -88,7 +88,7 @@ public function resolve(
         $customerId = $context->getUserId();
 
         /* Guest checking */
-        if (!$customerId && 0 === $customerId) {
+        if (null === $customerId || 0 === $customerId) {
             throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
         }
 
@@ -102,8 +102,8 @@ public function resolve(
             $wishlist->loadByCustomerId($customerId, true);
         }
 
-        if (null === $wishlist->getId()) {
-            throw new GraphQlInputException(__('Something went wrong while creating the wishlist'));
+        if (null === $wishlist->getId() || $customerId !== (int) $wishlist->getCustomerId()) {
+            throw new GraphQlInputException(__('The wishlist was not found.'));
         }
 
         $wishlistItems = [];

app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php

@@ -87,20 +87,24 @@ public function resolve(
         $customerId = $context->getUserId();
 
         /* Guest checking */
-        if (!$customerId && 0 === $customerId) {
+        if (null === $customerId || 0 === $customerId) {
             throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
         }
 
-        $wishlistId = $args['wishlist_id'];
+        $wishlistId = $args['wishlist_id'] ?: null;
+        $wishlist = $this->wishlistFactory->create();
 
-        if (!$wishlistId) {
-            throw new GraphQlInputException(__('The wishlist id is missing.'));
+        if ($wishlistId) {
+            $this->wishlistResource->load($wishlist, $wishlistId);
+        } elseif ($customerId) {
+            $wishlist->loadByCustomerId($customerId, true);
         }
 
-        $wishlist = $this->wishlistFactory->create();
-        $this->wishlistResource->load($wishlist, $wishlistId);
+        if ($wishlistId) {
+            $this->wishlistResource->load($wishlist, $wishlistId);
+        }
 
-        if (!$wishlist) {
+        if (null === $wishlist->getId() || $customerId !== (int) $wishlist->getCustomerId()) {
             throw new GraphQlInputException(__('The wishlist was not found.'));
         }
 

app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php

@@ -88,23 +88,24 @@ public function resolve(
         $customerId = $context->getUserId();
 
         /* Guest checking */
-        if (!$customerId && 0 === $customerId) {
+        if (null === $customerId || 0 === $customerId) {
             throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
         }
 
-        $wishlistId = $args['wishlist_id'];
+        $wishlistId = $args['wishlist_id'] ?: null;
+        $wishlist = $this->wishlistFactory->create();
 
-        if (!$wishlistId) {
-            throw new GraphQlInputException(__('The wishlist id is missing.'));
+        if ($wishlistId) {
+            $this->wishlistResource->load($wishlist, $wishlistId);
+        } elseif ($customerId) {
+            $wishlist->loadByCustomerId($customerId, true);
         }
 
-        $wishlist = $this->wishlistFactory->create();
-
         if ($wishlistId) {
             $this->wishlistResource->load($wishlist, $wishlistId);
         }
 
-        if (null === $wishlist->getId()) {
+        if (null === $wishlist->getId() || $customerId !== (int) $wishlist->getCustomerId()) {
             throw new GraphQlInputException(__('The wishlist was not found.'));
         }