Fix share assets, shared photo UI, and live show expiry

2026-02-06 07:30:30 +01:00
parent 18b4f36fcf
commit b14435df8b
12 changed files with 352 additions and 85 deletions
--- a/app/Http/Controllers/Api/EventPublicController.php
+++ b/app/Http/Controllers/Api/EventPublicController.php
@@ -1464,8 +1464,7 @@ class EventPublicController extends BaseController
            [
                'slug' => $shareLink->slug,
                'variant' => $variant,
-            ],
-            absolute: false
+            ]
        );
    }

--- a/app/Http/Controllers/Api/LiveShowController.php
+++ b/app/Http/Controllers/Api/LiveShowController.php
@@ -212,6 +212,10 @@ class LiveShowController extends BaseController

        return Event::query()
            ->where('live_show_token', $token)
+            ->where(function (Builder $query) {
+                $query->whereNull('live_show_token_expires_at')
+                    ->orWhere('live_show_token_expires_at', '>=', now());
+            })
            ->first();
    }

--- a/app/Http/Controllers/Api/Tenant/LiveShowLinkController.php
+++ b/app/Http/Controllers/Api/Tenant/LiveShowLinkController.php
@@ -53,6 +53,7 @@ class LiveShowLinkController extends Controller
            'url' => $url,
            'qr_code_data_url' => $this->buildQrCodeDataUrl($url),
            'rotated_at' => $event->live_show_token_rotated_at?->toIso8601String(),
+            'expires_at' => $event->live_show_token_expires_at?->toIso8601String(),
        ];
    }

--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -24,6 +24,7 @@ class Event extends Model
        'name' => 'array',
        'description' => 'array',
        'live_show_token_rotated_at' => 'datetime',
+        'live_show_token_expires_at' => 'datetime',
    ];

    protected static function booted(): void
@@ -47,6 +48,7 @@ class Event extends Model
            }

            app(EventJoinTokenService::class)->extendExpiryForEvent($event);
+            $event->refreshLiveShowTokenExpiry();
        });
    }

@@ -164,6 +166,8 @@ class Event extends Model
    public function ensureLiveShowToken(): string
    {
        if (is_string($this->live_show_token) && $this->live_show_token !== '') {
+            $this->refreshLiveShowTokenExpiry();
+
            return $this->live_show_token;
        }

@@ -179,11 +183,34 @@ class Event extends Model
        $this->forceFill([
            'live_show_token' => $token,
            'live_show_token_rotated_at' => now(),
+            'live_show_token_expires_at' => $this->computeLiveShowTokenExpiry(),
        ])->save();

        return $token;
    }

+    public function refreshLiveShowTokenExpiry(): void
+    {
+        if (! is_string($this->live_show_token) || $this->live_show_token === '') {
+            return;
+        }
+
+        $this->forceFill([
+            'live_show_token_expires_at' => $this->computeLiveShowTokenExpiry(),
+        ])->saveQuietly();
+    }
+
+    private function computeLiveShowTokenExpiry(): \Carbon\CarbonInterface
+    {
+        $eventDate = $this->date;
+
+        if ($eventDate instanceof \Carbon\CarbonInterface) {
+            return $eventDate->copy()->addDay()->endOfDay();
+        }
+
+        return now()->addDay();
+    }
+
    public function getSettingsAttribute($value): array
    {
        if (is_array($value)) {
--- a/database/migrations/2026_02_06_072321_add_live_show_token_expires_at_to_events_table.php
+++ b/database/migrations/2026_02_06_072321_add_live_show_token_expires_at_to_events_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('events', function (Blueprint $table) {
+            if (! Schema::hasColumn('events', 'live_show_token_expires_at')) {
+                $table->timestamp('live_show_token_expires_at')
+                    ->nullable()
+                    ->after('live_show_token_rotated_at');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('events', function (Blueprint $table) {
+            if (Schema::hasColumn('events', 'live_show_token_expires_at')) {
+                $table->dropColumn('live_show_token_expires_at');
+            }
+        });
+    }
+};
--- a/resources/js/guest-v2/tests/ScreensCopy.test.tsx
+++ b/resources/js/guest-v2/tests/ScreensCopy.test.tsx
@@ -43,7 +43,6 @@ vi.mock('lucide-react', () => ({
  ListVideo: () => <span>list</span>,
  RefreshCcw: () => <span>refresh</span>,
  FlipHorizontal: () => <span>flip</span>,
-  X: () => <span>close</span>,
  Sparkles: () => <span>sparkles</span>,
  Trophy: () => <span>trophy</span>,
  Play: () => <span>play</span>,
@@ -53,6 +52,8 @@ vi.mock('lucide-react', () => ({
  ChevronLeft: () => <span>chevron-left</span>,
  ChevronRight: () => <span>chevron-right</span>,
  QrCode: () => <span>qr</span>,
+  Loader2: () => <span>loader</span>,
+  Maximize2: () => <span>maximize</span>,
  Link: () => <span>link</span>,
  Users: () => <span>users</span>,
  Heart: () => <span>heart</span>,
--- a/resources/js/guest-v2/components/ShareSheet.tsx
+++ b/resources/js/guest-v2/components/ShareSheet.tsx
@@ -47,24 +47,27 @@ export default function ShareSheet({
  const { isDark } = useGuestThemeVariant();
  const mutedSurface = isDark ? 'rgba(255, 255, 255, 0.08)' : 'rgba(15, 23, 42, 0.06)';
  const mutedBorder = isDark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(15, 23, 42, 0.12)';
+  const inlineActive = variant === 'inline';
  const [inlineMounted, setInlineMounted] = React.useState(false);
  const [inlineVisible, setInlineVisible] = React.useState(false);

  React.useEffect(() => {
-    if (variant !== 'inline') return;
+    if (!inlineActive) {
+      setInlineMounted(false);
+      setInlineVisible(false);
+      return;
+    }
+
    if (open) {
      setInlineMounted(true);
-      const raf = window.requestAnimationFrame(() => {
-        setInlineVisible(true);
-      });
-      return () => window.cancelAnimationFrame(raf);
+      const frame = window.requestAnimationFrame(() => setInlineVisible(true));
+      return () => window.cancelAnimationFrame(frame);
    }
+
    setInlineVisible(false);
-    const timeout = window.setTimeout(() => {
-      setInlineMounted(false);
-    }, 220);
-    return () => window.clearTimeout(timeout);
-  }, [open, variant]);
+    const timer = window.setTimeout(() => setInlineMounted(false), 260);
+    return () => window.clearTimeout(timer);
+  }, [inlineActive, open]);

  const content = (
    <YStack gap="$3">
@@ -184,16 +187,14 @@ export default function ShareSheet({
        </Button>
      </XStack>

-      {url ? (
-        <Text fontSize="$1" color="$color" opacity={0.7} numberOfLines={1}>
-          {url}
-        </Text>
-      ) : null}
+      <Text fontSize="$1" color="$color" opacity={url ? 0.7 : 0} numberOfLines={1} style={{ minHeight: 16 }}>
+        {url ?? ' '}
+      </Text>
    </YStack>
  );

-  if (variant === 'inline') {
-    if (!inlineMounted) {
+  if (inlineActive) {
+    if (!inlineMounted && !open) {
      return null;
    }

@@ -203,16 +204,16 @@ export default function ShareSheet({
        inset={0}
        zIndex={20}
        justifyContent="flex-end"
-        pointerEvents={open ? 'auto' : 'none'}
+        pointerEvents={inlineVisible ? 'auto' : 'none'}
      >
        <Button
          unstyled
          onPress={() => onOpenChange(false)}
+          opacity={inlineVisible ? 1 : 0}
          style={{
            position: 'absolute',
            inset: 0,
            backgroundColor: isDark ? 'rgba(15, 23, 42, 0.5)' : 'rgba(15, 23, 42, 0.35)',
-            opacity: inlineVisible ? 1 : 0,
            transition: 'opacity 200ms ease',
          }}
          aria-label={t('common.actions.close', 'Close')}
@@ -222,9 +223,12 @@ export default function ShareSheet({
          backgroundColor="$surface"
          borderTopLeftRadius="$6"
          borderTopRightRadius="$6"
+          opacity={inlineVisible ? 1 : 0}
          style={{
-            transform: inlineVisible ? 'translateY(0)' : 'translateY(100%)',
-            transition: 'transform 220ms cubic-bezier(0.22, 1, 0.36, 1)',
+            backfaceVisibility: 'hidden',
+            transform: inlineVisible ? 'translate3d(0, 0, 0)' : 'translate3d(0, 56px, 0)',
+            transition: 'transform 260ms cubic-bezier(0.22, 1, 0.36, 1), opacity 220ms ease',
+            willChange: 'transform, opacity',
          }}
        >
          <YStack
--- a/resources/js/guest-v2/screens/GalleryScreen.tsx
+++ b/resources/js/guest-v2/screens/GalleryScreen.tsx
@@ -113,6 +113,8 @@ export default function GalleryScreen() {
  });
  const [deleteConfirmOpen, setDeleteConfirmOpen] = React.useState(false);
  const [deleteBusy, setDeleteBusy] = React.useState(false);
+  const [deleteConfirmMounted, setDeleteConfirmMounted] = React.useState(false);
+  const [deleteConfirmVisible, setDeleteConfirmVisible] = React.useState(false);
  const [likedIds, setLikedIds] = React.useState<Set<number>>(new Set());
  const touchStartX = React.useRef<number | null>(null);
  const fallbackAttemptedRef = React.useRef(false);
@@ -130,6 +132,26 @@ export default function GalleryScreen() {
  const [lightboxMounted, setLightboxMounted] = React.useState(false);
  const [lightboxVisible, setLightboxVisible] = React.useState(false);

+  React.useEffect(() => {
+    if (deleteConfirmOpen) {
+      setDeleteConfirmVisible(false);
+      setDeleteConfirmMounted(true);
+      let frame1 = 0;
+      let frame2 = 0;
+      frame1 = window.requestAnimationFrame(() => {
+        frame2 = window.requestAnimationFrame(() => setDeleteConfirmVisible(true));
+      });
+      return () => {
+        window.cancelAnimationFrame(frame1);
+        window.cancelAnimationFrame(frame2);
+      };
+    }
+
+    setDeleteConfirmVisible(false);
+    const timer = window.setTimeout(() => setDeleteConfirmMounted(false), 220);
+    return () => window.clearTimeout(timer);
+  }, [deleteConfirmOpen]);
+
  React.useEffect(() => {
    if (!token) {
      setPhotos([]);
@@ -1334,7 +1356,7 @@ export default function GalleryScreen() {
                  </Button>
                </XStack>
              </XStack>
-              {deleteConfirmOpen ? (
+              {deleteConfirmMounted ? (
                <YStack
                  position="absolute"
                  top={0}
@@ -1345,7 +1367,13 @@ export default function GalleryScreen() {
                  justifyContent="center"
                  padding="$4"
                  backgroundColor={isDark ? 'rgba(2, 6, 23, 0.7)' : 'rgba(15, 23, 42, 0.4)'}
-                  style={{ backdropFilter: 'blur(6px)', zIndex: 6 }}
+                  opacity={deleteConfirmVisible ? 1 : 0}
+                  pointerEvents={deleteConfirmVisible ? 'auto' : 'none'}
+                  style={{
+                    backdropFilter: 'blur(6px)',
+                    zIndex: 6,
+                    transition: 'opacity 200ms ease',
+                  }}
                >
                  <YStack
                    width="100%"
@@ -1356,7 +1384,15 @@ export default function GalleryScreen() {
                    backgroundColor="$surface"
                    borderWidth={1}
                    borderColor={mutedButtonBorder}
-                    style={{ boxShadow: cardShadow }}
+                    opacity={deleteConfirmVisible ? 1 : 0}
+                    style={{
+                      boxShadow: cardShadow,
+                      transform: deleteConfirmVisible
+                        ? 'translate3d(0, 0, 0) scale(1)'
+                        : 'translate3d(0, 12px, 0) scale(0.98)',
+                      transition: 'transform 220ms cubic-bezier(0.22, 1, 0.36, 1), opacity 200ms ease',
+                      willChange: 'transform, opacity',
+                    }}
                  >
                    <YStack gap="$1">
                      <Text fontSize="$4" fontWeight="$7">
--- a/resources/js/guest-v2/screens/SharedPhotoScreen.tsx
+++ b/resources/js/guest-v2/screens/SharedPhotoScreen.tsx
@@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
 import { YStack, XStack } from '@tamagui/stacks';
 import { SizableText as Text } from '@tamagui/text';
 import { Button } from '@tamagui/button';
-import { AlertCircle, Download } from 'lucide-react';
+import { AlertCircle, Download, Maximize2, X } from 'lucide-react';
 import StandaloneShell from '../components/StandaloneShell';
 import SurfaceCard from '../components/SurfaceCard';
 import EventLogo from '../components/EventLogo';
@@ -14,6 +14,7 @@ import { EventBrandingProvider } from '@/guest/context/EventBrandingContext';
 import { mapEventBranding } from '../lib/eventBranding';
 import { BrandingTheme } from '../lib/brandingTheme';
 import { useGuestThemeVariant } from '../lib/guestTheme';
+import { getBentoSurfaceTokens } from '../lib/bento';

 interface ShareResponse {
  slug: string;
@@ -38,6 +39,7 @@ export default function SharedPhotoScreen() {
    error: null,
    data: null,
  });
+  const [fullScreenOpen, setFullScreenOpen] = React.useState(false);
  const branding = React.useMemo(() => {
    if (!state.data?.branding) {
      return null;
@@ -46,6 +48,7 @@ export default function SharedPhotoScreen() {
  }, [state.data]);
  const { isDark } = useGuestThemeVariant(branding);
  const mutedText = isDark ? 'rgba(248, 250, 252, 0.7)' : 'rgba(15, 23, 42, 0.65)';
+  const bento = getBentoSurfaceTokens(isDark);

  React.useEffect(() => {
    let active = true;
@@ -105,66 +108,182 @@ export default function SharedPhotoScreen() {
  const chips = buildChips(data, t);

  const content = (
-    <StandaloneShell>
-      <SurfaceCard glow>
-        <XStack alignItems="center" gap="$3">
-          <EventLogo name={data.event?.name ?? t('share.defaultEvent', 'Ein besonderer Moment')} size="s" />
-          <YStack gap="$1">
-            <Text fontSize="$2" letterSpacing={2} textTransform="uppercase" color={mutedText}>
-              {t('share.title', 'Geteiltes Foto')}
-            </Text>
-            <Text fontSize="$6" fontWeight="$8">
-              {data.event?.name ?? t('share.defaultEvent', 'Ein besonderer Moment')}
-            </Text>
-          </YStack>
-        </XStack>
-        {data.photo.title ? (
-          <Text fontSize="$3" color={mutedText} marginTop="$1">
-            {data.photo.title}
-          </Text>
-        ) : null}
-      </SurfaceCard>
-
-      <SurfaceCard padding={0} overflow="hidden">
+    <StandaloneShell compact>
+      <YStack gap="$3" style={{ paddingBottom: 'calc(var(--space-6) + 50px)' }}>
        <YStack
-          height={360}
+          padding="$4"
+          borderRadius="$card"
+          borderWidth={1}
+          borderBottomWidth={2}
+          borderColor={bento.borderColor}
+          borderBottomColor={bento.borderBottomColor}
+          backgroundColor={bento.backgroundColor}
+          style={{ boxShadow: bento.shadow }}
+        >
+          <XStack alignItems="center" gap="$3" flexWrap="wrap">
+            <EventLogo name={data.event?.name ?? t('share.defaultEvent', 'Ein besonderer Moment')} size="s" />
+            <YStack gap="$1" flex={1} minWidth={180}>
+              <Text fontSize="$2" letterSpacing={2} textTransform="uppercase" color={mutedText}>
+                {t('share.title', 'Geteiltes Foto')}
+              </Text>
+              <Text fontSize="$6" fontWeight="$8">
+                {data.event?.name ?? t('share.defaultEvent', 'Ein besonderer Moment')}
+              </Text>
+            </YStack>
+          </XStack>
+          {data.photo.title ? (
+            <Text fontSize="$3" color={mutedText} marginTop="$2" numberOfLines={2}>
+              {data.photo.title}
+            </Text>
+          ) : null}
+        </YStack>
+
+        <YStack
+          padding="$2"
+          borderRadius="$card"
+          borderWidth={1}
+          borderBottomWidth={2}
+          borderColor={bento.borderColor}
+          borderBottomColor={bento.borderBottomColor}
+          backgroundColor={bento.backgroundColor}
+          style={{ boxShadow: bento.shadow }}
+        >
+          <YStack
+            borderRadius="$card"
+            overflow="hidden"
+            position="relative"
+            style={{
+              height: 'min(45vh, 320px)',
+              backgroundColor: isDark ? 'rgba(15, 23, 42, 0.4)' : 'rgba(15, 23, 42, 0.06)',
+              backgroundImage: `url(${data.photo.image_urls.full})`,
+              backgroundSize: 'cover',
+              backgroundPosition: 'center',
+            }}
+          >
+            <Button
+              size="$3"
+              circular
+              position="absolute"
+              top="$2"
+              right="$2"
+              backgroundColor={isDark ? 'rgba(15, 23, 42, 0.6)' : 'rgba(255, 255, 255, 0.85)'}
+              borderWidth={1}
+              borderColor={bento.borderColor}
+              onPress={() => setFullScreenOpen(true)}
+              aria-label={t('share.fullscreen', 'Fullscreen')}
+            >
+              <Maximize2 size={16} color={isDark ? '#F8FAFF' : '#0F172A'} />
+            </Button>
+          </YStack>
+        </YStack>
+
+        {chips.length > 0 ? (
+          <XStack gap="$2" flexWrap="wrap" justifyContent="center">
+            {chips.map((chip) => (
+              <SurfaceCard key={chip.id} padding="$2" borderRadius="$pill" minWidth={120}>
+                <XStack alignItems="center" gap="$2" flexWrap="wrap">
+                  {chip.icon ? <Text fontSize="$3">{chip.icon}</Text> : null}
+                  <Text fontSize="$2" color={mutedText}>
+                    {chip.label}
+                  </Text>
+                  <Text fontSize="$2" fontWeight="$7" numberOfLines={2} style={{ maxWidth: 220 }}>
+                    {chip.value}
+                  </Text>
+                </XStack>
+              </SurfaceCard>
+            ))}
+          </XStack>
+        ) : null}
+
+        <YStack style={{ position: 'sticky', bottom: 12 }}>
+          <Button
+            size="$4"
+            borderRadius="$pill"
+            backgroundColor="$primary"
+            onPress={() => window.open(data.photo.image_urls.full, '_blank')}
+            justifyContent="center"
+          >
+            <XStack alignItems="center" justifyContent="center" gap="$2" width="100%">
+              <Download size={18} color="white" />
+              <Text fontSize="$3" fontWeight="$7" color="white">
+                {t('galleryPublic.download', 'Download')}
+              </Text>
+            </XStack>
+          </Button>
+        </YStack>
+      </YStack>
+      {fullScreenOpen ? (
+        <YStack
+          position="fixed"
+          top={0}
+          left={0}
+          right={0}
+          bottom={0}
+          zIndex={3000}
+          alignItems="center"
+          justifyContent="center"
          style={{
-            backgroundImage: `url(${data.photo.image_urls.full})`,
-            backgroundSize: 'cover',
-            backgroundPosition: 'center',
+            backgroundColor: isDark ? 'rgba(2, 6, 23, 0.8)' : 'rgba(15, 23, 42, 0.45)',
+            backdropFilter: 'blur(14px)',
          }}
-        />
-      </SurfaceCard>
-
-      {chips.length > 0 ? (
-        <XStack gap="$2" flexWrap="wrap" justifyContent="center">
-          {chips.map((chip) => (
-            <SurfaceCard key={chip.id} padding="$2" borderRadius="$pill">
-              <XStack alignItems="center" gap="$2">
-                {chip.icon ? <Text fontSize="$3">{chip.icon}</Text> : null}
-                <Text fontSize="$2" color={mutedText}>
-                  {chip.label}
-                </Text>
-                <Text fontSize="$2" fontWeight="$7">
-                  {chip.value}
-                </Text>
-              </XStack>
-            </SurfaceCard>
-          ))}
-        </XStack>
+        >
+          <Button
+            unstyled
+            onPress={() => setFullScreenOpen(false)}
+            style={{ position: 'absolute', inset: 0 }}
+            aria-label={t('common.actions.close', 'Close')}
+          />
+          <YStack
+            width="92vw"
+            height="82vh"
+            maxWidth={920}
+            maxHeight={720}
+            borderRadius="$bentoLg"
+            overflow="hidden"
+            borderWidth={1}
+            borderColor={bento.borderColor}
+            style={{ position: 'relative', boxShadow: bento.shadow }}
+          >
+            <YStack
+              position="absolute"
+              top={0}
+              left={0}
+              right={0}
+              bottom={0}
+              style={{
+                backgroundImage: `url(${data.photo.image_urls.full})`,
+                backgroundSize: 'cover',
+                backgroundPosition: 'center',
+                filter: 'blur(26px)',
+                transform: 'scale(1.08)',
+                opacity: 0.6,
+              }}
+            />
+            <YStack flex={1} alignItems="center" justifyContent="center" padding="$4" style={{ zIndex: 1 }}>
+              <img
+                src={data.photo.image_urls.full}
+                alt={t('galleryPage.photo.alt', { id: data.photo.id, suffix: '' }, `Foto ${data.photo.id}`)}
+                style={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'contain' }}
+              />
+            </YStack>
+            <Button
+              size="$3"
+              circular
+              position="absolute"
+              top="$3"
+              right="$3"
+              backgroundColor={isDark ? 'rgba(15, 23, 42, 0.6)' : 'rgba(255, 255, 255, 0.85)'}
+              borderWidth={1}
+              borderColor={bento.borderColor}
+              onPress={() => setFullScreenOpen(false)}
+              aria-label={t('common.actions.close', 'Close')}
+              style={{ zIndex: 2 }}
+            >
+              <X size={16} color={isDark ? '#F8FAFF' : '#0F172A'} />
+            </Button>
+          </YStack>
+        </YStack>
      ) : null}
-
-      <Button
-        size="$4"
-        borderRadius="$pill"
-        backgroundColor="$primary"
-        onPress={() => window.open(data.photo.image_urls.full, '_blank')}
-      >
-        <Download size={18} color="white" />
-        <Text fontSize="$3" fontWeight="$7" color="white">
-          {t('galleryPublic.download', 'Download')}
-        </Text>
-      </Button>
    </StandaloneShell>
  );

--- a/tests/Feature/Api/PhotoShareLinkTest.php
+++ b/tests/Feature/Api/PhotoShareLinkTest.php
@@ -10,6 +10,7 @@ use App\Models\Tenant;
 use App\Services\EventJoinTokenService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;

 class PhotoShareLinkTest extends TestCase
@@ -64,13 +65,18 @@ class PhotoShareLinkTest extends TestCase

    public function test_share_payload_exposes_public_photo_data(): void
    {
+        Config::set('filesystems.default', 'public');
+        Storage::fake('public');
        $tenant = Tenant::factory()->create();
        $event = Event::factory()->for($tenant)->create(['status' => 'published']);
        $task = Task::factory()->for($tenant)->create();
        $photo = Photo::factory()->for($event)->create([
            'status' => 'approved',
            'task_id' => $task->id,
+            'file_path' => 'photos/share-test.jpg',
+            'thumbnail_path' => 'photos/thumbnails/share-test.jpg',
        ]);
+        Storage::disk('public')->put('photos/share-test.jpg', 'photo');

        $share = PhotoShareLink::factory()->for($photo)->create([
            'expires_at' => now()->addDay(),
@@ -95,5 +101,16 @@ class PhotoShareLinkTest extends TestCase
                'buttons',
            ],
        ]);
+
+        $assetUrl = $response->json('photo.image_urls.full');
+        $this->assertIsString($assetUrl);
+        $this->assertNotNull(parse_url($assetUrl, PHP_URL_SCHEME));
+
+        $parsed = parse_url($assetUrl);
+        $path = (string) ($parsed['path'] ?? '');
+        $query = $parsed['query'] ?? null;
+
+        $assetResponse = $this->get($path.($query ? "?{$query}" : ''));
+        $assetResponse->assertOk();
    }
 }
--- a/tests/Feature/LiveShowDataModelTest.php
+++ b/tests/Feature/LiveShowDataModelTest.php
@@ -15,7 +15,8 @@ class LiveShowDataModelTest extends TestCase

    public function test_event_can_ensure_and_rotate_live_show_token(): void
    {
-        $event = Event::factory()->create();
+        $eventDate = now()->addDays(1)->startOfDay();
+        $event = Event::factory()->create(['date' => $eventDate]);

        $token = $event->ensureLiveShowToken();

@@ -23,6 +24,7 @@ class LiveShowDataModelTest extends TestCase
        $this->assertSame(64, strlen($token));
        $this->assertSame($token, $event->refresh()->live_show_token);
        $this->assertNotNull($event->live_show_token_rotated_at);
+        $this->assertSame($eventDate->copy()->addDay()->endOfDay()->toIso8601String(), $event->live_show_token_expires_at?->toIso8601String());

        $rotated = $event->rotateLiveShowToken();

@@ -30,6 +32,24 @@ class LiveShowDataModelTest extends TestCase
        $this->assertSame(64, strlen($rotated));
        $this->assertNotSame($token, $rotated);
        $this->assertSame($rotated, $event->refresh()->live_show_token);
+        $this->assertSame($eventDate->copy()->addDay()->endOfDay()->toIso8601String(), $event->live_show_token_expires_at?->toIso8601String());
+    }
+
+    public function test_live_show_token_expiry_updates_when_event_date_changes(): void
+    {
+        $eventDate = now()->addDays(3)->startOfDay();
+        $event = Event::factory()->create(['date' => $eventDate]);
+
+        $event->ensureLiveShowToken();
+        $event->refresh();
+
+        $this->assertSame($eventDate->copy()->addDay()->endOfDay()->toIso8601String(), $event->live_show_token_expires_at?->toIso8601String());
+
+        $newDate = now()->addDays(7)->startOfDay();
+        $event->update(['date' => $newDate]);
+
+        $event->refresh();
+        $this->assertSame($newDate->copy()->addDay()->endOfDay()->toIso8601String(), $event->live_show_token_expires_at?->toIso8601String());
    }

    public function test_photo_live_status_is_cast_and_defaults_to_none(): void
--- a/tests/Feature/Tenant/LiveShowLinkControllerTest.php
+++ b/tests/Feature/Tenant/LiveShowLinkControllerTest.php
@@ -8,11 +8,13 @@ class LiveShowLinkControllerTest extends TenantTestCase
 {
    public function test_live_show_link_response_includes_qr_code_and_url(): void
    {
+        $eventDate = now()->addDays(2)->startOfDay();
        $event = Event::factory()
            ->for($this->tenant)
            ->create([
                'name' => ['de' => 'Live-Show Test', 'en' => 'Live Show Test'],
                'slug' => 'live-show-link-test',
+                'date' => $eventDate,
            ]);

        $response = $this->authenticatedRequest('GET', "/api/v1/tenant/events/{$event->slug}/live-show/link");
@@ -26,15 +28,18 @@ class LiveShowLinkControllerTest extends TenantTestCase
        $this->assertArrayHasKey('url', $data);
        $this->assertArrayHasKey('qr_code_data_url', $data);
        $this->assertArrayHasKey('rotated_at', $data);
+        $this->assertArrayHasKey('expires_at', $data);

        $this->assertIsString($data['token']);
        $this->assertIsString($data['url']);
        $this->assertIsString($data['qr_code_data_url']);
        $this->assertStringStartsWith('data:image/png;base64,', $data['qr_code_data_url']);
        $this->assertNotNull($data['rotated_at']);
+        $this->assertNotNull($data['expires_at']);

        $expectedBase = rtrim((string) config('app.url'), '/');
        $this->assertSame("{$expectedBase}/show/{$data['token']}", $data['url']);
+        $this->assertSame($eventDate->copy()->addDay()->endOfDay()->toIso8601String(), $data['expires_at']);
    }

    public function test_rotate_live_show_link_changes_token(): void