WIP: BUG#Ac-2797

Author: glo80326

app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php

@@ -49,7 +49,7 @@ public function resolve(
         /** @var CustomerInterface $customer */
         $customer = $value['model'];
         $customerId = (int)$customer->getId();
-        $websiteId = (int)$customer->getWebsiteId();
+        $websiteId = (int)$context->getExtensionAttributes()->getStore()->getWebsiteId();
         $status = $this->subscriberFactory->create()->loadByCustomer($customerId, $websiteId)->isSubscribed();
 
         return (bool)$status;

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Customer;
 
-use Exception;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
@@ -151,6 +150,40 @@ public function testUnsubscribeCustomer()
         $this->assertFalse($response['updateCustomer']['customer']['is_subscribed']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/multiple_websites_with_store_groups_stores.php
+     * @magentoApiDataFixture Magento/Customer/_files/create_customer_for_second_website.php
+     * @magentoConfigFixture default_store customer/account_share/scope 0
+     */
+    public function testSubscriptionStatusInMultiWebsiteSetup(): void
+    {
+        $currentEmail = 'axl@rose.com';
+        $currentPassword = 'axl@123';
+
+        $query = <<<QUERY
+            mutation {
+                updateCustomer(
+                    input: {
+                        is_subscribed: true
+                    }
+                ) {
+                    customer {
+                        is_subscribed
+                    }
+                }
+            }
+        QUERY;
+        $headers = [
+            'Store' => 'third_store_view',
+            'Authorization' => sprintf(
+                'Bearer %s',
+                $this->customerTokenService->createCustomerAccessToken($currentEmail, $currentPassword)
+            ),
+        ];
+        $response = $this->graphQlMutation($query, [], '', $headers);
+        $this->assertTrue($response['updateCustomer']['customer']['is_subscribed']);
+    }
+
     /**
      * @param string $email
      * @param string $password

dev/tests/integration/testsuite/Magento/Customer/_files/create_customer_for_second_website.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\Data\CustomerFactory;
+use Magento\Customer\Model\GroupManagement;
+use Magento\JwtUserToken\Api\Data\Revoked;
+use Magento\JwtUserToken\Api\RevokedRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $websiteRepository->get('second')->getId();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$store = $storeManager->getStore('second_store_view');
+$defaultGroupId = $objectManager->get(GroupManagement::class)->getDefaultGroup($store->getStoreId())->getId();
+/** @var $repository CustomerRepositoryInterface */
+$repository = $objectManager->create(CustomerRepositoryInterface::class);
+$customer = $objectManager->create(Customer::class);
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+/** @var Customer $customer */
+$customer->setWebsiteId($websiteId)
+    ->setId(2)
+    ->setEmail('axl@rose.com')
+    ->setPassword('axl@123')
+    ->setGroupId($defaultGroupId)
+    ->setStoreId($store->getStoreId())
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('Axl')
+    ->setLastname('Rose')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+$customerRegistry->remove($customer->getId());
+/** @var RevokedRepositoryInterface $revokedRepo */
+$revokedRepo = $objectManager->get(RevokedRepositoryInterface::class);
+$revokedRepo->saveRevoked(
+    new Revoked(
+        UserContextInterface::USER_TYPE_CUSTOMER,
+        (int) $customer->getId(),
+        time() - 3600 * 24
+    )
+);

dev/tests/integration/testsuite/Magento/Customer/_files/create_customer_for_second_website_rollback.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $websiteId = $websiteRepository->get('second')->getId();
+    $customer = $customerRepository->get('axl@rose.com', $websiteId);
+    $customerRepository->delete($customer);
+} catch (NoSuchEntityException $e) {
+    //customer or website already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);