From 7e51d33a6ffe1aed97e55b6bbee10c133b975357 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 16 Sep 2024 14:38:44 +0200 Subject: [PATCH] debug --- .github/workflows/ci.yaml | 24 ++++++++--------- assets/shop/js/card_encoder.js | 26 +++++++++++++++++++ .../CardTypeDataTransformer.php | 4 +-- src/Form/Type/TpayCardType.php | 12 ++++++++- tests/Application/package.json | 3 +++ tests/E2E/Helper/Order/CartTrait.php | 1 + 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index da22f8fe..a45cabbc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,18 +77,18 @@ jobs: e2e_js: "yes" node_version: '18.x' - - name: Check dependencies - continue-on-error: true - run: vendor/bin/composer-dependency-analyser - - - name: Static analysis - run: vendor/bin/phpstan - - - name: Check coding standard - run: vendor/bin/ecs check - - - name: Run tests (Unit) - run: vendor/bin/phpunit --testsuite unit +# - name: Check dependencies +# continue-on-error: true +# run: vendor/bin/composer-dependency-analyser +# +# - name: Static analysis +# run: vendor/bin/phpstan +# +# - name: Check coding standard +# run: vendor/bin/ecs check +# +# - name: Run tests (Unit) +# run: vendor/bin/phpunit --testsuite unit - name: Run tests (E2E) run: vendor/bin/phpunit --testsuite e2e diff --git a/assets/shop/js/card_encoder.js b/assets/shop/js/card_encoder.js index 787eb96c..44f9476f 100644 --- a/assets/shop/js/card_encoder.js +++ b/assets/shop/js/card_encoder.js @@ -1,4 +1,21 @@ import * as JSEncrypt from './jsencrypt.min'; +import * as Sentry from "@sentry/browser"; + +Sentry.init({ + dsn: "https://b4aeb8f84d49fdbae7d336d446bf46b6@o4507962673725440.ingest.de.sentry.io/4507962677395536", + integrations: [ + Sentry.browserTracingIntegration(), + Sentry.replayIntegration(), + Sentry.captureConsoleIntegration(), + ], + // Tracing + tracesSampleRate: 1.0, // Capture 100% of the transactions + // Set 'tracePropagationTargets' to control for which URLs distributed tracing should be enabled + tracePropagationTargets: ["localhost", /^https:\/\/yourserver\.io\/api/], + // Session Replay + replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production. + replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur. +}); document.addEventListener('DOMContentLoaded', () => { const form = document.querySelector('[name="sylius_checkout_complete"]'); @@ -13,13 +30,22 @@ document.addEventListener('DOMContentLoaded', () => { e.preventDefault(); const card_number = document.getElementById('sylius_checkout_complete_tpay_card_number').value.replace(/\s/g, ''); + console.log(card_number); const cvc = document.getElementById('sylius_checkout_complete_tpay_card_cvv').value.replace(/\s/g, ''); + console.log(cvc); const expiration_date_month = document.getElementById('sylius_checkout_complete_tpay_card_expiration_date_month').value.replace(/\s/g, ''); + console.log(expiration_date_month); const expiration_date_year = document.getElementById('sylius_checkout_complete_tpay_card_expiration_date_year').value.replace(/\s/g, ''); + console.log(expiration_date_year); const expiration_date = [expiration_date_month, expiration_date_year].join('/'); + console.log(expiration_date); + console.log(encrypted_card_field); + console.log(encrypt.encrypt([card_number, expiration_date, cvc, document.location.origin].join('|'))); encrypted_card_field.value = encrypt.encrypt([card_number, expiration_date, cvc, document.location.origin].join('|')); + console.error('test'); + form.submit(); }) }); diff --git a/src/Form/DataTransformer/CardTypeDataTransformer.php b/src/Form/DataTransformer/CardTypeDataTransformer.php index 94f08dcb..369bff2a 100644 --- a/src/Form/DataTransformer/CardTypeDataTransformer.php +++ b/src/Form/DataTransformer/CardTypeDataTransformer.php @@ -8,9 +8,9 @@ final class CardTypeDataTransformer implements DataTransformerInterface { - public function transform($value): ?array + public function transform($value): mixed { - return null; + return $value; } /** diff --git a/src/Form/Type/TpayCardType.php b/src/Form/Type/TpayCardType.php index ff881811..bba209f5 100644 --- a/src/Form/Type/TpayCardType.php +++ b/src/Form/Type/TpayCardType.php @@ -10,6 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Validator\Constraints\NotBlank; final class TpayCardType extends AbstractType { @@ -78,7 +79,16 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'label' => 'commerce_weavers_sylius_tpay.shop.order_summary.card.expiration_date.year', ], ) - ->add('card', HiddenType::class) + ->add( + 'card', + HiddenType::class, + [ + 'validation_groups' => ['sylius_checkout_complete'], + 'constraints' => [ + new NotBlank(), + ], + ] + ) ; $builder->addModelTransformer($this->cardTypeDataTransformer); diff --git a/tests/Application/package.json b/tests/Application/package.json index b428c24b..8e6a53c8 100644 --- a/tests/Application/package.json +++ b/tests/Application/package.json @@ -9,5 +9,8 @@ }, "devDependencies": { "@sylius-ui/frontend": "^1.0" + }, + "dependencies": { + "@sentry/browser": "^8.30.0" } } diff --git a/tests/E2E/Helper/Order/CartTrait.php b/tests/E2E/Helper/Order/CartTrait.php index 0a733074..07af9a74 100644 --- a/tests/E2E/Helper/Order/CartTrait.php +++ b/tests/E2E/Helper/Order/CartTrait.php @@ -29,6 +29,7 @@ public function processWithPaymentMethod(string $paymentMethodCode): void $paymentMethodCode, ), ); + $this->client->submitForm('Next'); }