One Click Blik

composer.json

@@ -28,6 +28,7 @@
         "symfony/http-foundation": "5.4.* || ^6.0",
         "symfony/http-kernel": "5.4.* || ^6.0",
         "symfony/routing": "5.4.* || ^6.0",
+        "symfony/uid": "5.4.*",
         "tpay-com/tpay-openapi-php": "^1.8"
     },
     "conflict": {

config/config/api_platform.php

@@ -6,8 +6,11 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Exception\OrderCannotBeFoundException;
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Exception\PaymentFailedException;
+use CommerceWeavers\SyliusTpayPlugin\Api\Exception\BlikAliasAmbiguousValueException;
 use CommerceWeavers\SyliusTpayPlugin\Api\Factory\Exception\UnresolvableNextCommandException;
 use CommerceWeavers\SyliusTpayPlugin\Payment\Exception\PaymentCannotBeCancelledException;
+use CommerceWeavers\SyliusTpayPlugin\PreconditionGuard\Exception\BlikAliasExpiredException;
+use CommerceWeavers\SyliusTpayPlugin\PreconditionGuard\Exception\BlikAliasNotRegisteredException;
 
 return function(ContainerConfigurator $configurator): void {
     $configurator->extension('api_platform', [
@@ -16,6 +19,9 @@
             PaymentCannotBeCancelledException::class => 400,
             UnresolvableNextCommandException::class => 400,
             PaymentFailedException::class => 424,
+            BlikAliasAmbiguousValueException::class => 400,
+            BlikAliasExpiredException::class => 400,
+            BlikAliasNotRegisteredException::class => 400,
         ],
         'mapping' => [
             'paths' => [

config/config/payum.php

@@ -12,4 +12,6 @@
         ->encryption()
         ->defuseSecretKey('%env(PAYUM_CYPHER_KEY)%')
     ;
+
+    $payum->storages('%commerce_weavers_sylius_tpay.model.blik_alias.class%', ['doctrine' => 'orm']);
 };

config/doctrine/BlikAlias.orm.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
+>
+    <mapped-superclass name="CommerceWeavers\SyliusTpayPlugin\Entity\BlikAlias" table="cw_sylius_tpay_blik_alias">
+        <id name="id" column="id" type="integer">
+            <generator />
+        </id>
+
+        <field name="value" column="value" />
+        <field name="expirationDate" column="expiration_date" type="datetime" nullable="true" />
+        <field name="registered" column="registered" type="boolean">
+            <options>
+                <option name="default">false</option>
+            </options>
+        </field>
+
+        <one-to-one field="customer" target-entity="Sylius\Component\Core\Model\CustomerInterface">
+            <join-column name="customer_id" nullable="false" on-delete="CASCADE" />
+        </one-to-one>
+    </mapped-superclass>
+</doctrine-mapping>

config/routes_webhook.php

@@ -6,6 +6,7 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Controller\InitApplePayPaymentAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\PaymentNotificationAction;
+use CommerceWeavers\SyliusTpayPlugin\Controller\TpayNotificationAction;
 use CommerceWeavers\SyliusTpayPlugin\Routing;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -15,6 +16,11 @@
         ->methods([Request::METHOD_POST])
     ;
 
+    $routes->add(Routing::WEBHOOK_NOTIFICATION, Routing::WEBHOOK_NOTIFICATION_PATH)
+        ->controller(TpayNotificationAction::class)
+        ->methods([Request::METHOD_POST])
+    ;
+
     $routes->add(Routing::WEBHOOK_PAYMENT_NOTIFICATION, Routing::WEBHOOK_PAYMENT_NOTIFICATION_PATH)
         ->controller(PaymentNotificationAction::class)
         ->methods([Request::METHOD_POST])

config/serialization/Pay.xml

@@ -17,6 +17,12 @@
         <attribute name="blikToken">
             <group>commerce_weavers_sylius_tpay:shop:order:pay</group>
         </attribute>
+        <attribute name="blikAliasAction">
+            <group>commerce_weavers_sylius_tpay:shop:order:pay</group>
+        </attribute>
+        <attribute name="blikAliasApplicationCode">
+            <group>commerce_weavers_sylius_tpay:shop:order:pay</group>
+        </attribute>
         <attribute name="googlePayToken">
             <group>commerce_weavers_sylius_tpay:shop:order:pay</group>
         </attribute>

config/services/api/command.php

@@ -62,6 +62,11 @@
 
     $services->set('commerce_weavers_sylius_tpay.api.command.pay_by_blik_handler', PayByBlikHandler::class)
         ->parent('commerce_weavers_sylius_tpay.api.command.abstract_pay_by_handler')
+        ->args([
+            service('commerce_weavers_sylius_tpay.resolver.blik_alias'),
+            service('commerce_weavers_sylius_tpay.manager.blik_alias'),
+            service('commerce_weavers_sylius_tpay.precondition_guard.active_blik_alias'),
+        ])
         ->tag('messenger.message_handler')
     ;
 

config/services/api/serializer/normalizer.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use CommerceWeavers\SyliusTpayPlugin\Api\Serializer\Normalizer\BlikAliasAmbiguousValueErrorNormalizer;
+
+return function(ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('commerce_weavers_sylius_tpay.api.serializer.normalizer.blik_alias_ambiguous_value_error', BlikAliasAmbiguousValueErrorNormalizer::class)
+        ->args([
+            service('api_platform.router'),
+        ])
+        ->tag('serializer.normalizer', ['priority' => -790])
+    ;
+};

config/services/api/validator.php

@@ -4,13 +4,27 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfBlikAliasActionIsRegisterValidator;
 use CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfGatewayConfigTypeEqualsValidator;
+use CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\OneOfPropertiesRequiredIfGatewayConfigTypeEqualsValidator;
 use CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\TpayChannelIdEligibilityValidator;
 
 return static function(ContainerConfigurator $container): void {
     $services = $container->services();
 
-    $services->set('commerce_weavers_sylius_tpay.api.validator.constraint.not_blank_if_payment_method_type_equals', NotBlankIfGatewayConfigTypeEqualsValidator::class)
+    $services->set('commerce_weavers_sylius_tpay.api.validator.constraint.not_blank_if_blik_alias_action_is_register', NotBlankIfBlikAliasActionIsRegisterValidator::class)
+        ->tag('validator.constraint_validator')
+    ;
+
+    $services->set('commerce_weavers_sylius_tpay.api.validator.constraint.not_blank_if_gateway_config_type_equals', NotBlankIfGatewayConfigTypeEqualsValidator::class)
+        ->args([
+            service('sylius.repository.order'),
+            service('payum.dynamic_gateways.cypher'),
+        ])
+        ->tag('validator.constraint_validator')
+    ;
+
+    $services->set('commerce_weavers_sylius_tpay.api.validator.constraint.one_of_properties_required_if_gateway_config_type_equals', OneOfPropertiesRequiredIfGatewayConfigTypeEqualsValidator::class)
         ->args([
             service('sylius.repository.order'),
             service('payum.dynamic_gateways.cypher'),

config/services/controller.php

@@ -7,8 +7,9 @@
 use CommerceWeavers\SyliusTpayPlugin\Controller\DisplayPaymentFailedPageAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\DisplayThankYouPageAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\DisplayWaitingForPaymentPage;
-use CommerceWeavers\SyliusTpayPlugin\Controller\InitApplePayPaymentAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\PaymentNotificationAction;
+use CommerceWeavers\SyliusTpayPlugin\Controller\InitApplePayPaymentAction;
+use CommerceWeavers\SyliusTpayPlugin\Controller\TpayNotificationAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\RetryPaymentAction;
 
 return function(ContainerConfigurator $container): void {
@@ -67,4 +68,13 @@
         ])
         ->tag('controller.service_arguments')
     ;
+
+    $services->set(TpayNotificationAction::class)
+        ->args([
+            service('commerce_weavers_sylius_tpay.tpay.security.notification.verifier.signature'),
+            service('commerce_weavers_sylius_tpay.repository.blik_alias'),
+            service('commerce_weavers_sylius_tpay.manager.blik_alias'),
+        ])
+        ->tag('controller.service_arguments')
+    ;
 };

config/services/payum/action.php

@@ -62,6 +62,7 @@
         ->args([
             service('commerce_weavers_sylius_tpay.tpay.factory.create_blik_level_zero_payment_payload'),
             service('commerce_weavers_sylius_tpay.payum.factory.token.notify'),
+            service('commerce_weavers_sylius_tpay.repository.blik_alias'),
         ])
         ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.create_blik_level_zero_transaction'])
     ;

config/services/precondition_guard.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use CommerceWeavers\SyliusTpayPlugin\PreconditionGuard\ActiveBlikAliasPreconditionGuard;
+use CommerceWeavers\SyliusTpayPlugin\PreconditionGuard\ActiveBlikAliasPreconditionGuardInterface;
+use Sylius\Calendar\Provider\DateTimeProviderInterface;
+
+return static function(ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('commerce_weavers_sylius_tpay.precondition_guard.active_blik_alias', ActiveBlikAliasPreconditionGuard::class)
+        ->args([
+            service(DateTimeProviderInterface::class),
+        ])
+        ->alias(ActiveBlikAliasPreconditionGuardInterface::class, 'commerce_weavers_sylius_tpay.precondition_guard.active_blik_alias')
+    ;
+};

config/services/resolver.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use CommerceWeavers\SyliusTpayPlugin\Resolver\BlikAliasResolver;
+use CommerceWeavers\SyliusTpayPlugin\Resolver\BlikAliasResolverInterface;
+
+return static function(ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('commerce_weavers_sylius_tpay.resolver.blik_alias', BlikAliasResolver::class)
+        ->args([
+            service('commerce_weavers_sylius_tpay.repository.blik_alias'),
+            service('commerce_weavers_sylius_tpay.factory.blik_alias'),
+        ])
+        ->alias(BlikAliasResolverInterface::class, 'commerce_weavers_sylius_tpay.resolver.blik_alias')
+    ;
+};

config/services/tpay.php

@@ -50,6 +50,7 @@
     $services->set('commerce_weavers_sylius_tpay.tpay.factory.create_blik_level_zero_payment_payload', CreateBlikLevelZeroPaymentPayloadFactory::class)
         ->args([
             service('commerce_weavers_sylius_tpay.tpay.factory.create_redirect_based_payment_payload'),
+            service('sylius.context.channel'),
         ])
         ->alias(CreateBlikLevelZeroPaymentPayloadFactoryInterface::class, 'commerce_weavers_sylius_tpay.tpay.factory.create_blik_level_zero_payment_payload')
     ;

config/services/validator.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use CommerceWeavers\SyliusTpayPlugin\Validator\Constraint\EncodedGooglePayTokenValidator;
+use CommerceWeavers\SyliusTpayPlugin\Validator\Constraint\ForAuthorizedUserOnlyValidator;
+
+return static function(ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('commerce_weavers_sylius_tpay.validator.constraint.encoded_google_pay_token', EncodedGooglePayTokenValidator::class)
+        ->tag('validator.constraint_validator')
+    ;
+
+    $services->set('commerce_weavers_sylius_tpay.validator.constraint.for_authorized_user_only', ForAuthorizedUserOnlyValidator::class)
+        ->args([
+            service('security.helper'),
+        ])
+        ->tag('validator.constraint_validator')
+    ;
+};

config/validation/Pay.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping https://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
     <class name="CommerceWeavers\SyliusTpayPlugin\Api\Command\Pay">
+        <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\OneOfPropertiesRequiredIfGatewayConfigTypeEquals">
+            <option name="paymentMethodType">blik</option>
+            <option name="properties">
+                <value>blikToken</value>
+                <value>blikAliasAction</value>
+            </option>
+            <option name="allFieldsAreBlankErrorMessage">commerce_weavers_sylius_tpay.shop.pay.blik.required_fields</option>
+            <option name="groups">
+                <value>commerce_weavers_sylius_tpay:shop:order:pay</value>
+            </option>
+        </constraint>
         <property name="applePayToken">
             <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfGatewayConfigTypeEquals">
                 <option name="paymentMethodType">apple_pay</option>
@@ -11,16 +22,23 @@
             </constraint>
         </property>
         <property name="blikToken">
-            <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfGatewayConfigTypeEquals">
-                <option name="paymentMethodType">blik</option>
-                <option name="fieldRequiredErrorMessage">commerce_weavers_sylius_tpay.shop.pay.blik_token.required</option>
+            <constraint name="Length">
+                <option name="value">6</option>
+                <option name="exactMessage">commerce_weavers_sylius_tpay.shop.pay.blik_token.length</option>
                 <option name="groups">
                     <value>commerce_weavers_sylius_tpay:shop:order:pay</value>
                 </option>
             </constraint>
-            <constraint name="Length">
-                <option name="value">6</option>
-                <option name="exactMessage">commerce_weavers_sylius_tpay.shop.pay.blik_token.length</option>
+            <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfBlikAliasActionIsRegister">
+                <option name="blikAliasActionPropertyName">blikAliasAction</option>
+                <option name="fieldRequiredErrorMessage">commerce_weavers_sylius_tpay.shop.pay.blik_token.required_with_alias_register</option>
+                <option name="groups">
+                    <value>commerce_weavers_sylius_tpay:shop:order:pay</value>
+                </option>
+            </constraint>
+        </property>
+        <property name="blikAliasAction">
+            <constraint name="CommerceWeavers\SyliusTpayPlugin\Validator\Constraint\ForAuthorizedUserOnly">
                 <option name="groups">
                     <value>commerce_weavers_sylius_tpay:shop:order:pay</value>
                 </option>

migrations/Version20241024132714.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeaversSyliusTpayMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20241024132714 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Introduce BlikAlias entity.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE cw_sylius_tpay_blik_alias (id INT AUTO_INCREMENT NOT NULL, customer_id INT NOT NULL, value VARCHAR(255) NOT NULL, expiration_date DATETIME DEFAULT NULL, registered TINYINT(1) DEFAULT false NOT NULL, UNIQUE INDEX UNIQ_72E078BE9395C3F3 (customer_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE cw_sylius_tpay_blik_alias ADD CONSTRAINT FK_72E078BE9395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE cw_sylius_tpay_blik_alias DROP FOREIGN KEY FK_72E078BE9395C3F3');
+        $this->addSql('DROP TABLE cw_sylius_tpay_blik_alias');
+    }
+}

src/Api/Command/Pay.php

@@ -5,6 +5,7 @@
 namespace CommerceWeavers\SyliusTpayPlugin\Api\Command;
 
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Contract\OrderTokenAwareInterface;
+use CommerceWeavers\SyliusTpayPlugin\Api\Enum\BlikAliasAction;
 
 final class Pay implements OrderTokenAwareInterface
 {
@@ -14,6 +15,8 @@ public function __construct(
         public readonly string $failureUrl,
         public readonly ?string $applePayToken = null,
         public readonly ?string $blikToken = null,
+        public readonly ?BlikAliasAction $blikAliasAction = null,
+        public readonly ?string $blikAliasApplicationCode = null,
         public readonly ?string $googlePayToken = null,
         public readonly ?string $encodedCardData = null,
         public readonly ?string $tpayChannelId = null,

src/Api/Command/PayByBlik.php

@@ -4,11 +4,15 @@
 
 namespace CommerceWeavers\SyliusTpayPlugin\Api\Command;
 
+use CommerceWeavers\SyliusTpayPlugin\Api\Enum\BlikAliasAction;
+
 final class PayByBlik
 {
     public function __construct(
         public readonly int $paymentId,
-        public readonly string $blikToken,
+        public readonly ?string $blikToken,
+        public readonly ?BlikAliasAction $blikAliasAction,
+        public readonly ?string $blikAliasApplicationCode,
     ) {
     }
 }