Add expiration in the query string of the resulting URL

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Add a Stimulus controller to disable expired links.
 * Add `temporary_url_autoexpire` Twig function.
+* Add expiration in the query string of the resulting URL.
 
 ## 1.2.1
 

src/Internal/TemporaryUrlManager.php

@@ -51,7 +51,7 @@ public function createTicket(
         object $resource,
         null|int|\DateInterval $ttl = null,
         ?string $sessionId = null,
-    ): string {
+    ): TemporaryUrlResult {
         $resource = $this->resourceTransformer->transform($resource);
 
         if (!$this->isObjectValid($resource)) {
@@ -62,6 +62,8 @@ public function createTicket(
             ? (int) $ttl->format('%s')
             : ($ttl ?? $this->defaultTtl);
 
+        $expiration = \time() + $ttl - 10;
+
         $ticketid = \bin2hex(\random_bytes(16));
         $temporaryUrlData = new TemporaryUrlParameters($resource, $ttl, $sessionId);
 
@@ -71,7 +73,7 @@ public function createTicket(
             $ttl,
         );
 
-        return $ticketid;
+        return new TemporaryUrlResult($ticketid, $expiration);
     }
 
     private function isObjectValid(object $resource): bool

src/Internal/TemporaryUrlResult.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of rekalogika/temporary-url-bundle package.
+ *
+ * (c) Priyadi Iman Nurcahyo <https://rekalogika.dev>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+namespace Rekalogika\TemporaryUrl\Internal;
+
+/**
+ * Represents the result of the request of a temporary URL
+ *
+ * @internal
+ */
+class TemporaryUrlResult
+{
+    public function __construct(
+        private string $ticketId,
+        private int $expiration,
+    ) {
+    }
+
+    public function getTicketId(): string
+    {
+        return $this->ticketId;
+    }
+
+    public function getExpiration(): int
+    {
+        return $this->expiration;
+    }
+}

src/TemporaryUrlGenerator.php

@@ -38,13 +38,14 @@ public function generateUrl(
             $sessionId = null;
         }
 
-        $ticket = $this->temporaryUrlManager
+        $temporaryUrlResult = $this->temporaryUrlManager
             ->createTicket($resource, $ttl, $sessionId);
 
         return $this->urlGenerator->generate(
             'rekalogika_temporary_url',
             [
-                'ticketid' => $ticket,
+                'ticketid' => $temporaryUrlResult->getTicketId(),
+                'expiration' => $temporaryUrlResult->getExpiration(),
             ],
             $referenceType
         );