Skip to content

Redirect fot WARNING_CONTINUE_CVV #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasz-falda merged 1 commit into from
May 27, 2026
Merged

Redirect fot WARNING_CONTINUE_CVV #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/Action/CaptureAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ class CaptureAction implements ActionInterface, GenericTokenFactoryAwareInterfac

public function __construct(
private OrderRequestService $orderRequestService,
private PayMethodsRequestService $payMethodsRequestService
private PayMethodsRequestService $payMethodsRequestService,
) {
}

/**
* @param Capture $request
*
* @throws HttpRedirect|IframeHttpRedirect|PayUException
*/
public function execute($request): void
{
Expand All @@ -66,21 +68,21 @@ public function execute($request): void

$orderCreatedResponse = $this->orderRequestService->create($orderRequest, $configKey);
$model->setPayUResponse($orderCreatedResponse);
if (StatusCode::Success === $orderCreatedResponse->status->statusCode) {
$this->updatePayment($model, $orderCreatedResponse, $firstModel, $token);
$request->setModel($model);

throw new HttpRedirect($orderCreatedResponse->redirectUri ?? $token->getAfterUrl());
}
$statusCode = $orderCreatedResponse->status->statusCode;
$httpRedirect = match (true) {
StatusCode::Success === $statusCode => new HttpRedirect($orderCreatedResponse->redirectUri ?? $token->getAfterUrl()),
(StatusCode::WarningContinue3ds === $statusCode && $orderCreatedResponse->iframeAllowed) => new IframeHttpRedirect($orderCreatedResponse->redirectUri),
StatusCode::WarningContinue3ds === $statusCode,
StatusCode::WarningContinueCVV === $statusCode => new HttpRedirect($orderCreatedResponse->redirectUri),
default => null,
Comment thread
lukasz-falda marked this conversation as resolved.
};

if (StatusCode::WarningContinue3ds === $orderCreatedResponse->status->statusCode) {
if (null !== $httpRedirect) {
$this->updatePayment($model, $orderCreatedResponse, $firstModel, $token);
$request->setModel($model);

throw match($orderCreatedResponse->iframeAllowed) {
true => new IframeHttpRedirect($orderCreatedResponse->redirectUri),
default => new HttpRedirect($orderCreatedResponse->redirectUri),
};
throw $httpRedirect;
}

throw PayUException::withResponse(
Expand All @@ -103,7 +105,7 @@ private function updatePayment(
Model $model,
OrderCreatedResponse $orderCreatedResponse,
PaymentInterface $payment,
TokenInterface $token
TokenInterface $token,
): void {
$model->setOrderId($orderCreatedResponse->orderId);
if ($payment instanceof Payment) {
Expand Down
81 changes: 80 additions & 1 deletion tests/Integration/Action/CaptureActionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Answear\Payum\PayU\Tests\Integration\Action;

use Answear\Payum\PayU\Action\CaptureAction;
use Answear\Payum\PayU\Core\Reply\IframeHttpRedirect;
use Answear\Payum\PayU\Enum\ChallengeRequestedType;
use Answear\Payum\PayU\Enum\ModelFields;
use Answear\Payum\PayU\Enum\PayMethodType;
Expand All @@ -28,6 +29,7 @@
use Payum\Core\Request\GetHumanStatus;
use Payum\Core\Security\GenericTokenFactory;
use Payum\Core\Security\TokenInterface;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -201,6 +203,83 @@ public function captureWithFailResponseTest(): void
self::assertTrue($withException);
}

#[Test]
#[DataProvider('provideWarningContinue3dsData')]
public function captureWithWarningContinue3dsTest(bool $iframeAllowed, string $expectedRedirectClass): void
{
$redirectUri = 'http://redirect-3ds.url';

$captureAction = $this->getCaptureAction(
new OrderCreatedResponse(
new OrderCreatedStatus(
StatusCode::WarningContinue3ds,
'Wymagana autoryzacja 3DS.'
),
$redirectUri,
'WZHF5FFDRJ140731GUEST000P01',
'vjis3d90tsozmuj0rjgs3i',
null,
$iframeAllowed
)
);

$captureToken = new Token();
$capture = new Capture($captureToken);
$capture->setModel(new \Answear\Payum\PayU\Tests\Payment());
$capture->setModel(FileTestUtil::decodeJsonFromFile(__DIR__ . '/data/details.json'));

$redirected = false;
try {
$captureAction->execute($capture);
} catch (HttpRedirect $httpRedirect) {
$redirected = true;
self::assertInstanceOf($expectedRedirectClass, $httpRedirect);
self::assertSame($redirectUri, $httpRedirect->getUrl());
}

self::assertTrue($redirected);
}

public static function provideWarningContinue3dsData(): iterable
{
yield 'iframe allowed' => [true, IframeHttpRedirect::class];
yield 'iframe not allowed' => [false, HttpRedirect::class];
}

#[Test]
public function captureWithWarningContinueCVVTest(): void
{
$redirectUri = 'http://redirect-cvv.url';

$captureAction = $this->getCaptureAction(
new OrderCreatedResponse(
new OrderCreatedStatus(
StatusCode::WarningContinueCVV,
'Wymagana weryfikacja CVV.'
),
$redirectUri,
'WZHF5FFDRJ140731GUEST000P01',
'vjis3d90tsozmuj0rjgs3i'
)
);

$captureToken = new Token();
$capture = new Capture($captureToken);
$capture->setModel(new \Answear\Payum\PayU\Tests\Payment());
$capture->setModel(FileTestUtil::decodeJsonFromFile(__DIR__ . '/data/details.json'));

$redirected = false;
try {
$captureAction->execute($capture);
} catch (HttpRedirect $httpRedirect) {
$redirected = true;
self::assertNotInstanceOf(IframeHttpRedirect::class, $httpRedirect);
self::assertSame($redirectUri, $httpRedirect->getUrl());
}

self::assertTrue($redirected);
}

#[Test]
public function captureWithOrderIdFailsTest(): void
{
Expand Down Expand Up @@ -276,7 +355,7 @@ static function ($request) use ($details) {
->willReturn($details ?? FileTestUtil::decodeJsonFromFile(__DIR__ . '/data/details.json'));
}
if ($payment instanceof PaymentInterface) {
$payment->setDetails($details ?? FileTestUtil::decodeJsonFromFile(__DIR__ . '/data/details.json'));
$payment->setDetails(new \ArrayObject($details ?? FileTestUtil::decodeJsonFromFile(__DIR__ . '/data/details.json')));
}
}

Expand Down
Loading