fix: checkout as guest customer (#166)

cyl3x · web-flow · commit 169d48b4936d · 2025-03-18T13:48:04.000+01:00
fixes #165
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
+# 9.7.2
+- Fixes an issue, where guest checkout was not possible (shopware/SwagPayPal#165)
+
 # 9.7.1
-- Fixes an issue where payments could not be refunded (shopware/shopware#7644)
+- Fixes an issue, where payments could not be refunded (shopware/shopware#7644)
 
 # 9.7.0
 - PPI-1000 - Fixes an issue, where PayLater is shown in cases where it should not be available
diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,6 @@
+# 9.7.2
+- Behebt ein Problem, bei dem der Checkout als Gast nicht möglich war (shopware/SwagPayPal#165)
+
 # 9.7.1
 - Behebt ein Problem, bei dem Zahlungen nicht erstattet werden konnten (shopware/shopware#7644)
 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "swag/paypal",
     "description": "PayPal integration for Shopware 6",
-    "version": "9.7.1",
+    "version": "9.7.2",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [
diff --git a/src/Resources/config/services/storefront.xml b/src/Resources/config/services/storefront.xml
@@ -71,7 +71,7 @@
             <argument type="service" id="Swag\PayPal\Setting\Service\CredentialsUtil"/>
         </service>
 
-        <service id="Swag\PayPal\Storefront\Data\Service\ACDCCheckoutDataService" public="true" parent="Swag\PayPal\Storefront\Data\Service\AbstractCheckoutDataService" />
+        <service id="Swag\PayPal\Storefront\Data\Service\ACDCCheckoutDataService" public="true" parent="Swag\PayPal\Storefront\Data\Service\AbstractCheckoutDataService"/>
         <service id="Swag\PayPal\Storefront\Data\Service\ApplePayCheckoutDataService" public="true" parent="Swag\PayPal\Storefront\Data\Service\AbstractCheckoutDataService"/>
         <service id="Swag\PayPal\Storefront\Data\Service\GooglePayCheckoutDataService" public="true" parent="Swag\PayPal\Storefront\Data\Service\AbstractCheckoutDataService" />
         <service id="Swag\PayPal\Storefront\Data\Service\PayLaterCheckoutDataService" public="true" parent="Swag\PayPal\Storefront\Data\Service\AbstractCheckoutDataService" />
diff --git a/src/Storefront/Data/Service/AbstractCheckoutDataService.php b/src/Storefront/Data/Service/AbstractCheckoutDataService.php
@@ -27,6 +27,8 @@ abstract class AbstractCheckoutDataService extends AbstractScriptDataService
 {
     public const PAYPAL_ERROR = 'isPayPalError';
 
+    protected AbstractMethodData $methodData;
+
     /**
      * @internal
      */
@@ -38,6 +40,7 @@ public function __construct(
         CredentialsUtilInterface $credentialsUtil,
     ) {
         parent::__construct($localeCodeProvider, $systemConfigService, $credentialsUtil);
+        $this->methodData = $this->paymentMethodDataRegistry->getPaymentMethod($this->getMethodDataClass());
     }
 
     abstract public function buildCheckoutData(SalesChannelContext $context, ?Cart $cart = null, ?OrderEntity $order = null): ?AbstractCheckoutData;
@@ -53,10 +56,7 @@ protected function getBaseData(SalesChannelContext $context, ?OrderEntity $order
             throw CartException::customerNotLoggedIn();
         }
 
-        $paymentMethodId = $this->paymentMethodDataRegistry->getEntityIdFromData(
-            $this->paymentMethodDataRegistry->getPaymentMethod($this->getMethodDataClass()),
-            $context->getContext()
-        );
+        $paymentMethodId = $this->paymentMethodDataRegistry->getEntityIdFromData($this->methodData, $context->getContext());
 
         $salesChannelId = $context->getSalesChannelId();
 
diff --git a/src/Storefront/Data/Service/SPBCheckoutDataService.php b/src/Storefront/Data/Service/SPBCheckoutDataService.php
@@ -71,12 +71,17 @@ public function buildCheckoutData(
 
         $data = $this->getBaseData($context, $order);
 
+        $userIdToken = null;
+        if ($this->methodData->isVaultable($context)) {
+            $userIdToken = $this->customerVaultTokenRoute->getVaultToken($context)->getToken();
+        }
+
         return (new SPBCheckoutButtonData())->assign(\array_merge($data, [
             'buttonColor' => $this->systemConfigService->getString(Settings::SPB_BUTTON_COLOR, $salesChannelId),
             'useAlternativePaymentMethods' => $this->systemConfigService->getBool(Settings::SPB_ALTERNATIVE_PAYMENT_METHODS_ENABLED, $salesChannelId),
             'disabledAlternativePaymentMethods' => $this->getDisabledAlternativePaymentMethods($price, $currency->getIsoCode()),
             'showPayLater' => $this->systemConfigService->getBool(Settings::SPB_SHOW_PAY_LATER, $salesChannelId),
-            'userIdToken' => $this->customerVaultTokenRoute->getVaultToken($context)->getToken(),
+            'userIdToken' => $userIdToken,
         ]));
     }
 
diff --git a/src/Storefront/Data/Service/VenmoCheckoutDataService.php b/src/Storefront/Data/Service/VenmoCheckoutDataService.php
@@ -41,8 +41,13 @@ public function buildCheckoutData(SalesChannelContext $context, ?Cart $cart = nu
     {
         $data = $this->getBaseData($context, $order);
 
+        $userIdToken = null;
+        if ($this->methodData->isVaultable($context)) {
+            $userIdToken = $this->customerVaultTokenRoute->getVaultToken($context)->getToken();
+        }
+
         return (new VenmoCheckoutData())->assign(\array_merge($data, [
-            'userIdToken' => $this->customerVaultTokenRoute->getVaultToken($context)->getToken(),
+            'userIdToken' => $userIdToken,
         ]));
     }
 
diff --git a/src/Util/Lifecycle/Method/ACDCMethodData.php b/src/Util/Lifecycle/Method/ACDCMethodData.php
@@ -98,6 +98,10 @@ public function getCheckoutTemplateExtensionId(): string
 
     public function isVaultable(SalesChannelContext $context): bool
     {
+        if (!$context->getCustomer() || $context->getCustomer()->getGuest()) {
+            return false;
+        }
+
         $systemConfigService = $this->container->get(SystemConfigService::class);
 
         return $systemConfigService->getBool(Settings::VAULTING_ENABLED_ACDC, $context->getSalesChannelId());
diff --git a/src/Util/Lifecycle/Method/PayPalMethodData.php b/src/Util/Lifecycle/Method/PayPalMethodData.php
@@ -98,6 +98,10 @@ public function getCheckoutTemplateExtensionId(): string
 
     public function isVaultable(SalesChannelContext $context): bool
     {
+        if (!$context->getCustomer() || $context->getCustomer()->getGuest()) {
+            return false;
+        }
+
         $systemConfigService = $this->container->get(SystemConfigService::class);
 
         return $systemConfigService->getBool(Settings::VAULTING_ENABLED_WALLET, $context->getSalesChannelId());
diff --git a/src/Util/Lifecycle/Method/VenmoMethodData.php b/src/Util/Lifecycle/Method/VenmoMethodData.php
@@ -112,6 +112,10 @@ public function validateCapability(MerchantIntegrations $merchantIntegrations):
 
     public function isVaultable(SalesChannelContext $context): bool
     {
+        if (!$context->getCustomer() || $context->getCustomer()->getGuest()) {
+            return false;
+        }
+
         $systemConfigService = $this->container->get(SystemConfigService::class);
 
         return $systemConfigService->getBool(Settings::VAULTING_ENABLED_VENMO, $context->getSalesChannelId());
diff --git a/tests/Storefront/Data/Service/SPBCheckoutDataServiceTest.php b/tests/Storefront/Data/Service/SPBCheckoutDataServiceTest.php
@@ -0,0 +1,155 @@
+<?php declare(strict_types=1);
+/*
+ * (c) shopware AG <info@shopware.com>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Swag\PayPal\Test\Storefront\Data\Service;
+
+use Monolog\Test\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use Shopware\Core\Checkout\Customer\Aggregate\CustomerAddress\CustomerAddressEntity;
+use Shopware\Core\Checkout\Customer\CustomerEntity;
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\Uuid\Uuid;
+use Shopware\Core\System\Country\Aggregate\CountryState\CountryStateEntity;
+use Shopware\Core\System\Country\CountryEntity;
+use Shopware\Core\System\Currency\CurrencyEntity;
+use Shopware\Core\System\SystemConfig\SystemConfigService;
+use Shopware\Core\Test\Generator;
+use Swag\PayPal\Checkout\SalesChannel\CustomerVaultTokenRoute;
+use Swag\PayPal\Checkout\TokenResponse;
+use Swag\PayPal\Setting\Service\CredentialsUtilInterface;
+use Swag\PayPal\Setting\Settings;
+use Swag\PayPal\Storefront\Data\Service\SPBCheckoutDataService;
+use Swag\PayPal\Test\Helper\CartTrait;
+use Swag\PayPal\Test\Helper\ServicesTrait;
+use Swag\PayPal\Test\Mock\Setting\Service\SystemConfigServiceMock;
+use Swag\PayPal\Util\Lifecycle\Method\PaymentMethodDataRegistry;
+use Swag\PayPal\Util\Lifecycle\Method\PayPalMethodData;
+use Swag\PayPal\Util\LocaleCodeProvider;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * @internal
+ */
+#[Package('checkout')]
+#[CoversClass(SPBCheckoutDataService::class)]
+class SPBCheckoutDataServiceTest extends TestCase
+{
+    use CartTrait;
+    use ServicesTrait;
+
+    protected SPBCheckoutDataService $checkoutDataService;
+
+    protected SystemConfigServiceMock $systemConfigService;
+
+    protected CustomerVaultTokenRoute&MockObject $customerVaultTokenRoute;
+
+    protected PaymentMethodDataRegistry&MockObject $paymentMethodDataRegistry;
+
+    protected function setUp(): void
+    {
+        $this->systemConfigService = $this->createSystemConfigServiceMock([
+            Settings::VAULTING_ENABLED_WALLET => false,
+        ]);
+
+        $this->customerVaultTokenRoute = $this->createMock(CustomerVaultTokenRoute::class);
+        $this->paymentMethodDataRegistry = $this->createMock(PaymentMethodDataRegistry::class);
+
+        $container = $this->createMock(Container::class);
+        $container
+            ->method('get')
+            ->willReturnCallback(function (string $service): mixed {
+                return match ($service) {
+                    SystemConfigService::class => $this->systemConfigService,
+                    default => static::fail('Getting service "' . $service . '" is not handled'),
+                };
+            });
+
+        $this->paymentMethodDataRegistry
+            ->expects(static::once())
+            ->method('getPaymentMethod')
+            ->with(PayPalMethodData::class)
+            ->willReturn(new PayPalMethodData($container));
+
+        $this->checkoutDataService = new SPBCheckoutDataService(
+            $this->paymentMethodDataRegistry,
+            $this->createMock(LocaleCodeProvider::class),
+            $this->createMock(RouterInterface::class),
+            $this->systemConfigService,
+            $this->createMock(CredentialsUtilInterface::class),
+            $this->customerVaultTokenRoute,
+        );
+    }
+
+    #[DataProvider('providerTestSetUserIdToken')]
+    public function testSetUserIdToken(?string $expected, bool $guest, bool $enabled): void
+    {
+        $this->systemConfigService->set(Settings::VAULTING_ENABLED_WALLET, $enabled);
+        $context = Generator::createSalesChannelContext(currency: $this->createCurrency(), customer: $this->createCustomer($guest));
+        $this->customerVaultTokenRoute
+            ->expects(static::exactly((int) (!$guest && $enabled)))
+            ->method('getVaultToken')
+            ->willReturn(new TokenResponse('user-id-token'));
+
+        $data = $this->checkoutDataService->buildCheckoutData(
+            $context,
+            $this->createCart(Uuid::randomHex()),
+        );
+
+        static::assertSame($expected, $data?->getUserIdToken());
+    }
+
+    public static function providerTestSetUserIdToken(): \Generator
+    {
+        yield 'non-guest, setting enabled' => ['user-id-token', false, true];
+        yield 'guest, setting enabled' => [null, true, true];
+        yield 'non-guest, setting disabled' => [null, false, false];
+        yield 'guest, setting disabled' => [null, true, false];
+    }
+
+    private function createCustomer(bool $guest): CustomerEntity
+    {
+        $customer = new CustomerEntity();
+        $customer->setId(Uuid::randomHex());
+        $customer->setGuest($guest);
+        $customer->setActiveBillingAddress($this->createCustomerAddress());
+
+        return $customer;
+    }
+
+    private function createCurrency(): CurrencyEntity
+    {
+        $currency = new CurrencyEntity();
+        $currency->setId(Uuid::randomHex());
+        $currency->setIsoCode('EUR');
+
+        return $currency;
+    }
+
+    private function createCustomerAddress(): CustomerAddressEntity
+    {
+        $country = new CountryEntity();
+        $country->setIso3('DEU');
+        $country->setIso('DE');
+
+        $countryState = new CountryStateEntity();
+        $countryState->setName('Test Country State');
+
+        $address = new CustomerAddressEntity();
+        $address->setStreet('Test street');
+        $address->setCountryState($countryState);
+        $address->setCountry($country);
+        $address->setFirstName('Max');
+        $address->setLastName('Mustermann');
+        $address->setCity('Testhausen');
+        $address->setZipcode('44444');
+
+        return $address;
+    }
+}
diff --git a/tests/Storefront/Data/Service/VenmoCheckoutDataServiceTest.php b/tests/Storefront/Data/Service/VenmoCheckoutDataServiceTest.php

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +# 9.7.2
 +- Behebt ein Problem, bei dem der Checkout als Gast nicht möglich war (shopware/SwagPayPal#165)
++
 # 9.7.1
 - Behebt ein Problem, bei dem Zahlungen nicht erstattet werden konnten (shopware/shopware#7644)
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "swag/paypal",`
`3`	`3`	`"description": "PayPal integration for Shopware 6",`
`4`		`- "version": "9.7.1",`
	`4`	`+ "version": "9.7.2",`
`5`	`5`	`"type": "shopware-platform-plugin",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"authors": [`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,13 @@ public function buildCheckoutData(SalesChannelContext $context, ?Cart $cart = nu`
`41`	`41`	`{`
`42`	`42`	`$data = $this->getBaseData($context, $order);`
`43`	`43`
	`44`	`+ $userIdToken = null;`
	`45`	`+ if ($this->methodData->isVaultable($context)) {`
	`46`	`+ $userIdToken = $this->customerVaultTokenRoute->getVaultToken($context)->getToken();`
	`47`	`+ }`
	`48`	`+`
`44`	`49`	`return (new VenmoCheckoutData())->assign(\array_merge($data, [`
`45`		`- 'userIdToken' => $this->customerVaultTokenRoute->getVaultToken($context)->getToken(),`
	`50`	`+ 'userIdToken' => $userIdToken,`
`46`	`51`	`]));`
`47`	`52`	`}`
`48`	`53`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,10 @@ public function getCheckoutTemplateExtensionId(): string`
`98`	`98`
`99`	`99`	`public function isVaultable(SalesChannelContext $context): bool`
`100`	`100`	`{`
	`101`	`+ if (!$context->getCustomer() \|\| $context->getCustomer()->getGuest()) {`
	`102`	`+ return false;`
	`103`	`+ }`
	`104`	`+`
`101`	`105`	`$systemConfigService = $this->container->get(SystemConfigService::class);`
`102`	`106`
`103`	`107`	`return $systemConfigService->getBool(Settings::VAULTING_ENABLED_ACDC, $context->getSalesChannelId());`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,10 @@ public function validateCapability(MerchantIntegrations $merchantIntegrations):`
`112`	`112`
`113`	`113`	`public function isVaultable(SalesChannelContext $context): bool`
`114`	`114`	`{`
	`115`	`+ if (!$context->getCustomer() \|\| $context->getCustomer()->getGuest()) {`
	`116`	`+ return false;`
	`117`	`+ }`
	`118`	`+`
`115`	`119`	`$systemConfigService = $this->container->get(SystemConfigService::class);`
`116`	`120`
`117`	`121`	`return $systemConfigService->getBool(Settings::VAULTING_ENABLED_VENMO, $context->getSalesChannelId());`