Merge branch 'main' into develop

Author: daveearley

backend/app/DomainObjects/OrderDomainObject.php

@@ -29,8 +29,6 @@ class OrderDomainObject extends Generated\OrderDomainObjectAbstract implements I
 
     public ?EventDomainObject $event = null;
 
-    public ?string $sessionIdentifier = null;
-
     public static function getAllowedFilterFields(): array
     {
         return [
@@ -255,15 +253,4 @@ public function getInvoices(): ?Collection
     {
         return $this->invoices;
     }
-
-    public function setSessionIdentifier(?string $sessionIdentifier): OrderDomainObject
-    {
-        $this->sessionIdentifier = $sessionIdentifier;
-        return $this;
-    }
-
-    public function getSessionIdentifier(): ?string
-    {
-        return $this->sessionIdentifier;
-    }
 }

backend/app/Http/Actions/Orders/Public/CreateOrderActionPublic.php

@@ -48,12 +48,10 @@ public function __invoke(CreateOrderRequest $request, int $eventId): JsonRespons
             ])
         );
 
-        $order->setSessionIdentifier($sessionId);
-
         $response =  $this->resourceResponse(
             resource: OrderResourcePublic::class,
             data: $order,
-            statusCode: ResponseCodes::HTTP_CREATED,
+            statusCode: ResponseCodes::HTTP_CREATED
         );
 
         return $response->withCookie(

backend/app/Http/Actions/Orders/Public/GetOrderActionPublic.php

@@ -6,15 +6,13 @@
 use HiEvents\Resources\Order\OrderResourcePublic;
 use HiEvents\Services\Application\Handlers\Order\DTO\GetOrderPublicDTO;
 use HiEvents\Services\Application\Handlers\Order\GetOrderPublicHandler;
-use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class GetOrderActionPublic extends BaseAction
 {
     public function __construct(
-        private readonly GetOrderPublicHandler            $getOrderPublicHandler,
-        private readonly CheckoutSessionManagementService $sessionService,
+        private readonly GetOrderPublicHandler $getOrderPublicHandler
     )
     {
     }
@@ -27,17 +25,9 @@ public function __invoke(int $eventId, string $orderShortId, Request $request):
             includeEventInResponse: $this->isIncludeRequested($request, 'event'),
         ));
 
-        $response = $this->resourceResponse(
+        return $this->resourceResponse(
             resource: OrderResourcePublic::class,
             data: $order,
         );
-
-        if ($request->query->has('session_identifier')) {
-            $response->headers->setCookie(
-                $this->sessionService->getSessionCookie()
-            );
-        }
-
-        return $response;
     }
 }

backend/app/Resources/Order/OrderResourcePublic.php

@@ -8,6 +8,7 @@
 use HiEvents\Resources\Attendee\AttendeeResourcePublic;
 use HiEvents\Resources\BaseResource;
 use HiEvents\Resources\Event\EventResourcePublic;
+use HiEvents\Resources\Order\Invoice\InvoiceResource;
 use HiEvents\Resources\Order\Invoice\InvoiceResourcePublic;
 use Illuminate\Http\Request;
 
@@ -63,9 +64,6 @@ public function toArray(Request $request): array
                 !is_null($this->getAttendees()),
                 fn() => AttendeeResourcePublic::collection($this->getAttendees())
             ),
-            $this->mergeWhen($this->getSessionIdentifier() !== null, fn() => [
-                'session_identifier' => $this->getSessionIdentifier(),
-            ]),
         ];
     }
 }

backend/app/Services/Infrastructure/Session/CheckoutSessionManagementService.php

@@ -22,17 +22,15 @@ public function __construct(
     }
 
     /**
-     * Get the session ID from query param, cookie, or generate a new one.
+     * Get the session ID from the cookie, or generate a new one if it doesn't exist.
      */
     public function getSessionId(): string
     {
         if ($this->sessionId) {
             return $this->sessionId;
         }
 
-        $this->sessionId = $this->request->query(self::SESSION_IDENTIFIER)
-            ?? $this->request->cookie(self::SESSION_IDENTIFIER)
-            ?? $this->createSessionId();
+        $this->sessionId = $this->request->cookie(self::SESSION_IDENTIFIER) ?? $this->createSessionId();
 
         return $this->sessionId;
     }

frontend/src/api/order.client.ts

@@ -116,24 +116,8 @@ export const orderClientPublic = {
         return response.data;
     },
 
-    findByShortId: async (
-        eventId: number,
-        orderShortId: string,
-        includes: string[] = [],
-        sessionIdentifier?: string
-    ) => {
-        const query = new URLSearchParams();
-        if (includes.length > 0) {
-            query.append("include", includes.join(","));
-        }
-        if (sessionIdentifier) {
-            query.append("session_identifier", sessionIdentifier);
-        }
-
-        const response = await publicApi.get<GenericDataResponse<Order>>(
-            `events/${eventId}/order/${orderShortId}?${query.toString()}`
-        );
-
+    findByShortId: async (eventId: number, orderShortId: string, includes: string[] = []) => {
+        const response = await publicApi.get<GenericDataResponse<Order>>(`events/${eventId}/order/${orderShortId}?include=${includes.join(',')}`);
         return response.data;
     },
 

frontend/src/components/routes/product-widget/SelectProducts/index.tsx

@@ -103,10 +103,7 @@ const SelectProducts = (props: SelectProductsProps) => {
             .then(() => {
                 const url = '/checkout/' + eventId + '/' + data.data.short_id + '/details';
                 if (props.widgetMode === 'embedded') {
-                    window.open(
-                        url + '?session_identifier=' + data.data.session_identifier + '&utm_source=embedded_widget',
-                        '_blank'
-                    );
+                    window.open(url, '_blank');
                     setOrderInProcessOverlayVisible(true);
                     return;
                 }

frontend/src/queries/useGetOrderPublic.ts

@@ -1,44 +1,25 @@
 import {useQuery} from "@tanstack/react-query";
 import {orderClientPublic} from "../api/order.client.ts";
 import {IdParam, Order} from "../types.ts";
-import {useMemo} from "react";
-import {isSsr} from "../utilites/helpers.ts";
 
-export const GET_ORDER_PUBLIC_QUERY_KEY = "getOrderPublic";
-
-const getSessionIdentifierFromUrl = (): string | null => {
-    if (isSsr()) return null;
-
-    const url = new URL(window.location.href);
-    return url.searchParams.get("session_identifier");
-};
-
-export const useGetOrderPublic = (
-    eventId: IdParam,
-    orderShortId: IdParam,
-    includes: string[] = []
-) => {
-    const sessionIdentifier = useMemo(getSessionIdentifierFromUrl, []);
+export const GET_ORDER_PUBLIC_QUERY_KEY = 'getOrderPublic';
 
+export const useGetOrderPublic = (eventId: IdParam, orderShortId: IdParam, includes: string[] = []) => {
     return useQuery<Order>({
-        queryKey: [
-            GET_ORDER_PUBLIC_QUERY_KEY,
-            eventId,
-            orderShortId,
-            sessionIdentifier,
-        ],
+        queryKey: [GET_ORDER_PUBLIC_QUERY_KEY, eventId, orderShortId],
+
         queryFn: async () => {
             const {data} = await orderClientPublic.findByShortId(
                 Number(eventId),
                 String(orderShortId),
                 includes,
-                sessionIdentifier ?? undefined
             );
             return data;
         },
+
         refetchOnWindowFocus: false,
         staleTime: 500,
         retryOnMount: false,
-        retry: false,
+        retry: false
     });
-};
+}

frontend/src/types.ts

@@ -475,7 +475,6 @@ export interface Order {
     question_answers?: QuestionAnswer[];
     event?: Event;
     latest_invoice?: Invoice;
-    session_identifier?: string;
 }
 
 export interface Invoice {