Merge pull request #50 from FLUX-SE/idempotency_key

Prometee · web-flow · commit 742613909737 · 2025-09-01T23:31:50.000+02:00
Avoid duplicate using idempotency key
diff --git a/src/Action/AbstractCaptureAction.php b/src/Action/AbstractCaptureAction.php
@@ -63,6 +63,41 @@ protected function processNotNew(BaseArrayObject $model, Generic $request): void
         $this->gateway->execute(new Sync($model));
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    protected function getApiResourceOptions(Generic $request): array
+    {
+        $options = [];
+
+        $idempotencyKey = $this->getIdempotencyKey($request);
+        if (null !== $idempotencyKey) {
+            $options['idempotency_key'] = $idempotencyKey;
+        }
+
+        return $options;
+    }
+
+    protected function getIdempotencyKey(Generic $request): ?string
+    {
+        $token = $request->getToken();
+        if (null === $token) {
+            return null;
+        }
+
+        $id = $token->getDetails()->getId();
+        if (false === is_scalar($id)) {
+            return null;
+        }
+
+        $id = (string) $id;
+        if ('' === $id) {
+            return null;
+        }
+
+        return md5($id);
+    }
+
     abstract protected function createApiResource(BaseArrayObject $model, Generic $request): ApiResource;
 
     abstract protected function render(ApiResource $captureResource, Generic $request): void;
diff --git a/src/Action/StripeCheckoutSession/CaptureAction.php b/src/Action/StripeCheckoutSession/CaptureAction.php
@@ -22,7 +22,10 @@ protected function createApiResource(ArrayObject $model, Generic $request): ApiR
         $model->offsetSet('success_url', $token->getAfterUrl());
         $model->offsetSet('cancel_url', $token->getAfterUrl());
 
-        $createRequest = new CreateSession($model->getArrayCopy());
+        $createRequest = new CreateSession(
+            $model->getArrayCopy(),
+            $this->getApiResourceOptions($request)
+        );
         $this->gateway->execute($createRequest);
 
         return $createRequest->getApiResource();
diff --git a/src/Action/StripeJs/CaptureAction.php b/src/Action/StripeJs/CaptureAction.php
@@ -16,7 +16,10 @@ class CaptureAction extends AbstractCaptureAction
 {
     protected function createApiResource(ArrayObject $model, Generic $request): ApiResource
     {
-        $createRequest = new CreatePaymentIntent($model->getArrayCopy());
+        $createRequest = new CreatePaymentIntent(
+            $model->getArrayCopy(),
+            $this->getApiResourceOptions($request)
+        );
         $this->gateway->execute($createRequest);
 
         return $createRequest->getApiResource();
diff --git a/tests/Action/StripeCheckoutSession/CaptureActionTest.php b/tests/Action/StripeCheckoutSession/CaptureActionTest.php
@@ -55,10 +55,19 @@ public function testShouldDoASyncIfPaymentHasId(): void
         $gatewayMock
             ->expects($this->exactly(2))
             ->method('execute')
-            ->withConsecutive(
-                [$this->isInstanceOf(Sync::class)],
-                [$this->isInstanceOf(CaptureAuthorized::class)]
-            )
+            ->with($this->callback(function ($request) {
+                static $callCount = 0;
+                $callCount++;
+
+                switch ($callCount) {
+                    case 1:
+                        return $request instanceof Sync;
+                    case 2:
+                        return $request instanceof CaptureAuthorized;
+                    default:
+                        return false;
+                }
+            }))
         ;
 
         $token = new Token();
@@ -99,13 +108,26 @@ public function executeCaptureAction(array $model, string $objectName): void
         $gatewayMock
             ->expects($this->exactly(3))
             ->method('execute')
-            ->withConsecutive(
-                [$this->isInstanceOf(CreateSession::class)],
-                [$this->isInstanceOf(Sync::class)],
-                [$this->isInstanceOf(RedirectToCheckout::class)]
-            )
+            ->with($this->callback(function ($request) {
+                static $callCount = 0;
+                $callCount++;
+
+                switch ($callCount) {
+                    case 1:
+                        return $request instanceof CreateSession;
+                    case 2:
+                        return $request instanceof Sync;
+                    case 3:
+                        return $request instanceof RedirectToCheckout;
+                    default:
+                        return false;
+                }
+            }))
             ->willReturnOnConsecutiveCalls(
                 $this->returnCallback(function (CreateSession $request) {
+                    $this->assertEquals([
+                        'idempotency_key' => md5(1),
+                    ], $request->getOptions());
                     $this->assertInstanceOf(ArrayObject::class, $request->getModel());
                     $request->setApiResource(new Session('sess_0001'));
                 }),
diff --git a/tests/Action/StripeJs/CaptureActionTest.php b/tests/Action/StripeJs/CaptureActionTest.php
@@ -52,10 +52,19 @@ public function testShouldDoASyncIfPaymentHasId(): void
         $gatewayMock
             ->expects($this->exactly(2))
             ->method('execute')
-            ->withConsecutive(
-                [$this->isInstanceOf(Sync::class)],
-                [$this->isInstanceOf(CaptureAuthorized::class)]
-            )
+            ->with($this->callback(function ($arg) {
+                static $callCount = 0;
+                $callCount++;
+
+                switch ($callCount) {
+                    case 1:
+                        return $arg instanceof Sync;
+                    case 2:
+                        return $arg instanceof CaptureAuthorized;
+                    default:
+                        return false;
+                }
+            }))
         ;
 
         $token = new Token();
@@ -96,13 +105,26 @@ public function executeCaptureAction(array $model): void
         $gatewayMock
             ->expects($this->exactly(3))
             ->method('execute')
-            ->withConsecutive(
-                [$this->isInstanceOf(CreatePaymentIntent::class)],
-                [$this->isInstanceOf(Sync::class)],
-                [$this->isInstanceOf(RenderStripeJs::class)]
-            )
+            ->with($this->callback(function ($arg) {
+                static $callCount = 0;
+                $callCount++;
+
+                switch ($callCount) {
+                    case 1:
+                        return $arg instanceof CreatePaymentIntent;
+                    case 2:
+                        return $arg instanceof Sync;
+                    case 3:
+                        return $arg instanceof RenderStripeJs;
+                    default:
+                        return false;
+                }
+            }))
             ->willReturnOnConsecutiveCalls(
                 $this->returnCallback(function (CreatePaymentIntent $request) {
+                    $this->assertEquals([
+                        'idempotency_key' => md5(1),
+                    ], $request->getOptions());
                     $this->assertInstanceOf(ArrayObject::class, $request->getModel());
                     $request->setApiResource(new PaymentIntent('pi_0001'));
                 }),

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ class CaptureAction extends AbstractCaptureAction`
`16`	`16`	`{`
`17`	`17`	`protected function createApiResource(ArrayObject $model, Generic $request): ApiResource`
`18`	`18`	`{`
`19`		`- $createRequest = new CreatePaymentIntent($model->getArrayCopy());`
	`19`	`+ $createRequest = new CreatePaymentIntent(`
	`20`	`+ $model->getArrayCopy(),`
	`21`	`+ $this->getApiResourceOptions($request)`
	`22`	`+ );`
`20`	`23`	`$this->gateway->execute($createRequest);`
`21`	`24`
`22`	`25`	`return $createRequest->getApiResource();`