#253791 [bugfix] Silent booking failure on session expire

AOEpeople · Jul 12, 2022 · e759598 · e759598
1 parent d1f7ffa
commit e759598
Show file tree

Hide file tree

Showing 25 changed files with 159 additions and 88 deletions.
diff --git a/src/Mealz/MealBundle/Controller/ParticipantController.php b/src/Mealz/MealBundle/Controller/ParticipantController.php
@@ -96,7 +96,7 @@ public function delete(
 
         $this->triggerDeleteEvents($participant);
 
-        if (($this->getDoorman()->isKitchenStaff()) === true) {
+        if (true === $this->getDoorman()->isKitchenStaff()) {
             $logger = $this->get('monolog.logger.balance');
             $logger->info(
                 'admin removed {profile} from {meal} (Meal: {mealId})',

diff --git a/src/Mealz/MealBundle/Message/NewOfferMessage.php b/src/Mealz/MealBundle/Message/NewOfferMessage.php
@@ -26,13 +26,13 @@ public function getContent(): string
         $offerCount = $this->offerService->getOfferCount($this->participant->getMeal()->getDateTime());
 
         return $this->translator->trans(
-                'mattermost.offered',
-                [
-                    '%count%' => $offerCount,
-                    '%dish%' => $this->getBookedDishTitle($this->participant),
-                ],
-                'messages',
-                'en_EN'
-            );
+            'mattermost.offered',
+            [
+                '%count%' => $offerCount,
+                '%dish%' => $this->getBookedDishTitle($this->participant),
+            ],
+            'messages',
+            'en_EN'
+        );
     }
 }
diff --git a/src/Mealz/MealBundle/Message/WeeklyMenuMessage.php b/src/Mealz/MealBundle/Message/WeeklyMenuMessage.php
@@ -37,13 +37,13 @@ public function getContent(): string
 
         if ($this->week->isEnabled()) {
             $header = '#### ' . $this->translator->trans(
-                    'week.notification.header.default',
-                    [
-                        '%weekStart%' => $this->week->getStartTime()->format('d.m.'),
-                        '%weekEnd%' => $this->week->getEndTime()->format('d.m.'),
-                    ],
-                    'messages'
-                );
+                'week.notification.header.default',
+                [
+                    '%weekStart%' => $this->week->getStartTime()->format('d.m.'),
+                    '%weekEnd%' => $this->week->getEndTime()->format('d.m.'),
+                ],
+                'messages'
+            );
             $tableHeader = "\n|Day|Meals|\n|:-----|:-----|\n";
             $body = $this->getDishesByWeek($this->week);
             $footer = $this->translator->trans('week.notification.footer.default', [], 'messages');

diff --git a/src/Mealz/MealBundle/Service/ParticipationServiceTrait.php b/src/Mealz/MealBundle/Service/ParticipationServiceTrait.php
@@ -129,7 +129,7 @@ private function updateCombinedMealDishes(Participant $participant, array $dishS
                 ParticipationException::ERR_INVALID_OPERATION
             );
         }
-        if ((2 !== count($dishSlugs))) {
+        if (2 !== count($dishSlugs)) {
             throw new ParticipationException(
                 'invalid dish count; combined meal expects 2 dishes, got ' . count($dishSlugs),
                 ParticipationException::ERR_COMBI_MEAL_INVALID_DISH_COUNT

diff --git a/src/Mealz/UserBundle/EventSubscriber/ExceptionSubscriber.php b/src/Mealz/UserBundle/EventSubscriber/ExceptionSubscriber.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mealz\UserBundle\EventSubscriber;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+class ExceptionSubscriber implements EventSubscriberInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::EXCEPTION => ['handleException', 5],
+        ];
+    }
+
+    public function handleException(ExceptionEvent $event): void
+    {
+        if (!$event->getRequest()->isXmlHttpRequest()) {
+            return;
+        }
+
+        $exception = $event->getThrowable();
+        if ($exception instanceof AuthenticationException || $exception instanceof AccessDeniedException) {
+            $event->setResponse(new JsonResponse(null, 401));
+        }
+    }
+}
diff --git a/src/Resources/js/init.js b/src/Resources/js/init.js
@@ -11,7 +11,7 @@ import 'jquery-datetimepicker/build/jquery.datetimepicker.full';
 import '@fancyapps/fancybox';
 import 'easy-autocomplete';
 import 'daterangepicker';
-import {Controller} from "./controller";
+import {Controller} from './controller';
 
 
 

diff --git a/src/Resources/js/modules/ajax-error-handler.ts b/src/Resources/js/modules/ajax-error-handler.ts
@@ -0,0 +1,16 @@
+export default class AjaxErrorHandler {
+    public static handleError(jqXHR: JQueryXHR, customFn?: () => void){
+        if (401 === jqXHR.status) {
+            location.reload();
+            return;
+        }
+
+        if (undefined !== customFn) {
+            customFn();
+            return;
+        }
+
+        console.log(jqXHR.status + ': ' + jqXHR.statusText);
+        alert('An unknown error occurred');
+    }
+}
diff --git a/src/Resources/js/modules/ajax-forms.js b/src/Resources/js/modules/ajax-forms.js
@@ -1,3 +1,5 @@
+import AjaxErrorHandler from './ajax-error-handler';
+
 Mealz.prototype.initAjaxForms = function () {
     var that = this;
     $('.load-ajax-form').on('click', function (e) {
@@ -88,8 +90,8 @@ Mealz.prototype.loadAjaxForm = function ($element) {
 
             $element.addClass('loaded');
         },
-        error: function (xhr) {
-            console.log(xhr.status + ': ' + xhr.statusText);
+        error: function (jqXHR) {
+            AjaxErrorHandler.handleError(jqXHR);
         }
     });
 };
@@ -146,8 +148,8 @@ Mealz.prototype.loadAjaxFormPayment = function ($element) {
                 that.enablePaypal();
             }
         },
-        error: function (xhr) {
-            console.log(xhr.status + ': ' + xhr.statusText);
+        error: function (jqXHR) {
+            AjaxErrorHandler.handleError(jqXHR);
         }
     });
 };
diff --git a/src/Resources/js/modules/combined-meal-dialog.ts b/src/Resources/js/modules/combined-meal-dialog.ts
@@ -1,6 +1,6 @@
 import 'jquery-ui/ui/widgets/dialog';
-import {BaseDialog} from "./base-dialog";
-import {Dish} from "./combined-meal-service";
+import {BaseDialog} from './base-dialog';
+import {Dish} from './combined-meal-service';
 
 export class CombinedMealDialog extends BaseDialog {
     private readonly containerID: string = '#combined-meal-selector';

diff --git a/src/Resources/js/modules/combined-meal-offers-dialog.ts b/src/Resources/js/modules/combined-meal-offers-dialog.ts
@@ -1,5 +1,5 @@
 import 'jquery-ui/ui/widgets/dialog';
-import {BaseDialog} from "./base-dialog";
+import {BaseDialog} from './base-dialog';
 
 export class CombinedMealOffersDialog extends BaseDialog {
     private readonly containerID: string = '#combined-meal-selector';

diff --git a/src/Resources/js/modules/combined-meal-offers-service.ts b/src/Resources/js/modules/combined-meal-offers-service.ts
@@ -1,7 +1,7 @@
 import 'jquery-ui/ui/widgets/dialog';
-import {CombinedMealOffersDialog, Offer} from "./combined-meal-offers-dialog";
-import {AbstractParticipationToggleHandler} from "./participation-toggle-handler";
-import {ParticipantCounter} from "./participant-counter";
+import {CombinedMealOffersDialog, Offer} from './combined-meal-offers-dialog';
+import {AbstractParticipationToggleHandler} from './participation-toggle-handler';
+import {ParticipantCounter} from './participant-counter';
 
 export class CombinedMealOffersService {
     public static execute($checkbox: JQuery, participationToggleHandler: AbstractParticipationToggleHandler) {
@@ -36,4 +36,4 @@ export class CombinedMealOffersService {
 interface Offers {
     title: string,
     offers: Array<Offer>
-}
+}
diff --git a/src/Resources/js/modules/combined-meal-service.ts b/src/Resources/js/modules/combined-meal-service.ts
@@ -1,4 +1,4 @@
-import {MealService} from "./meal-service";
+import {MealService} from './meal-service';
 
 export class CombinedMealService {
 

diff --git a/src/Resources/js/modules/confirm-swap-dialog.ts b/src/Resources/js/modules/confirm-swap-dialog.ts
@@ -1,7 +1,7 @@
 import 'jquery-ui/ui/widgets/dialog';
-import {ParticipationRequest, ParticipationRequestHandler} from "./participation-request-handler";
-import {ActionResponse} from "./participation-response-handler";
-import {BaseDialog} from "./base-dialog";
+import {ParticipationRequest, ParticipationRequestHandler} from './participation-request-handler';
+import {ActionResponse} from './participation-response-handler';
+import {BaseDialog} from './base-dialog';
 
 export class ConfirmSwapDialog extends BaseDialog {
     private readonly containerID: string = '#confirm-swapbox';
@@ -36,4 +36,4 @@ interface ConfirmSwapDialogOptions {
     participationRequest: ParticipationRequest,
     $checkbox: JQuery,
     handlerMethod: ($checkbox: JQuery, response: ActionResponse) => void
-}
+}
diff --git a/src/Resources/js/modules/custom-functions.js b/src/Resources/js/modules/custom-functions.js
@@ -1,3 +1,5 @@
+import AjaxErrorHandler from './ajax-error-handler';
+
 Mealz.prototype.toggleArrayItem = function (a, v) {
     var i = a.indexOf(v);
     if (i === -1)
@@ -59,6 +61,9 @@ Mealz.prototype.copyToClipboard = function() {
                     }
                 }
                 return false;
+            },
+            error: function(jqXHR){
+                AjaxErrorHandler.handleError(jqXHR);
             }
         });
     });

diff --git a/src/Resources/js/modules/meal-offer-update-handler.ts b/src/Resources/js/modules/meal-offer-update-handler.ts
@@ -1,5 +1,5 @@
-import {ParticipationUpdateHandler} from "./participation-update-handler";
-import {MealService} from "./meal-service";
+import {ParticipationUpdateHandler} from './participation-update-handler';
+import {MealService} from './meal-service';
 
 export enum MealOfferStates {
     New = 'new',

diff --git a/src/Resources/js/modules/participation-pre-toggle-handler.ts b/src/Resources/js/modules/participation-pre-toggle-handler.ts
@@ -1,9 +1,9 @@
-import {CombinedMealDialog, SerializedFormData} from "./combined-meal-dialog";
+import {CombinedMealDialog, SerializedFormData} from './combined-meal-dialog';
 import Event = JQuery.Event;
-import {AbstractParticipationToggleHandler} from "./participation-toggle-handler";
-import {ParticipantCounter} from "./participant-counter";
-import {CombinedMealOffersService} from "./combined-meal-offers-service";
-import {CombinedMealService} from "./combined-meal-service";
+import {AbstractParticipationToggleHandler} from './participation-toggle-handler';
+import {ParticipantCounter} from './participant-counter';
+import {CombinedMealOffersService} from './combined-meal-offers-service';
+import {CombinedMealService} from './combined-meal-service';
 
 export class ParticipationPreToggleHandler {
     private readonly participationToggleHandler: AbstractParticipationToggleHandler;

diff --git a/src/Resources/js/modules/participation-request-handler.ts b/src/Resources/js/modules/participation-request-handler.ts
@@ -1,4 +1,5 @@
-import {ParticipationResponse} from "./participation-response-handler";
+import {ParticipationResponse} from './participation-response-handler';
+import AjaxErrorHandler from './ajax-error-handler';
 
 export class ParticipationRequest {
     readonly url: string;
@@ -37,13 +38,14 @@ export class ParticipationRequestHandler {
             success: function (data) {
                 handle($checkbox, data);
             },
-            error: function (xhr) {
-                console.log(xhr.status + ': ' + xhr.statusText);
-                if (true === ParticipationRequestHandler.isJoinRequest(participationRequest.url)) {
-                    let mealTitle = $checkbox.closest('.meal-row').children('.title').text();
-                    let errMsg = $('.weeks').data('errJoinNotPossible').replace('%dish%', mealTitle);
-                    ParticipationRequestHandler.sendAlert(errMsg);
-                }
+            error: function (jqXHR) {
+                AjaxErrorHandler.handleError(jqXHR, function (){
+                    if (true === ParticipationRequestHandler.isJoinRequest(participationRequest.url)) {
+                        let mealTitle = $checkbox.closest('.meal-row').children('.title').text();
+                        let errMsg = $('.weeks').data('errJoinNotPossible').replace('%dish%', mealTitle);
+                        ParticipationRequestHandler.sendAlert(errMsg);
+                    }
+                });
             }
         });
     }

diff --git a/src/Resources/js/modules/participation-response-handler.ts b/src/Resources/js/modules/participation-response-handler.ts
@@ -1,4 +1,4 @@
-import {AcceptOfferData, ParticipationUpdateHandler, ToggleData} from "./participation-update-handler";
+import {AcceptOfferData, ParticipationUpdateHandler, ToggleData} from './participation-update-handler';
 
 export interface ParticipationResponse {
     actionText: string;

diff --git a/src/Resources/js/modules/participation-toggle-handler.ts b/src/Resources/js/modules/participation-toggle-handler.ts
@@ -1,11 +1,11 @@
-import {ParticipantCounter} from "./participant-counter";
-import {ParticipationResponseHandler} from "./participation-response-handler";
+import {ParticipantCounter} from './participant-counter';
+import {ParticipationResponseHandler} from './participation-response-handler';
 import {
     ParticipationRequest,
     ParticipationRequestHandler
-} from "./participation-request-handler";
-import {ConfirmSwapDialog} from "./confirm-swap-dialog";
-import {CombinedMealService} from "./combined-meal-service";
+} from './participation-request-handler';
+import {ConfirmSwapDialog} from './confirm-swap-dialog';
+import {CombinedMealService} from './combined-meal-service';
 
 export abstract class AbstractParticipationToggleHandler {
     constructor($checkboxes: JQuery) {

diff --git a/src/Resources/js/modules/participation-update-handler.ts b/src/Resources/js/modules/participation-update-handler.ts
@@ -1,6 +1,6 @@
-import {Labels, TooltipLabel} from "./labels";
-import {CombinedMealService} from "./combined-meal-service";
-import {MealService} from "./meal-service";
+import {Labels, TooltipLabel} from './labels';
+import {CombinedMealService} from './combined-meal-service';
+import {MealService} from './meal-service';
 
 /**
  * Meal States

diff --git a/src/Resources/js/views/adminParticipationEdit.ts b/src/Resources/js/views/adminParticipationEdit.ts
@@ -1,5 +1,6 @@
-import {CombinedMealDialog, SerializedFormData} from "../modules/combined-meal-dialog";
-import {Dish, DishVariation} from "../modules/combined-meal-service";
+import {CombinedMealDialog, SerializedFormData} from '../modules/combined-meal-dialog';
+import {Dish, DishVariation} from '../modules/combined-meal-service';
+import AjaxErrorHandler from '../modules/ajax-error-handler';
 
 interface DeleteResponseData {
     participantsCount: number;
@@ -346,14 +347,16 @@ export default class AdminParticipationEditView {
             data: payload,
             dataType: 'json',
             success: successFn,
-            error: function (xhr, status, error) {
-                if (failureFn) {
-                    let errMsg = status;
-                    if ('' !== error) {
-                        errMsg += `, ${error}`;
+            error: function (jqXHR, status, error) {
+                AjaxErrorHandler.handleError(jqXHR, function(){
+                    if (failureFn) {
+                        let errMsg = status;
+                        if ('' !== error) {
+                            errMsg += `, ${error}`;
+                        }
+                        failureFn(errMsg);
                     }
-                    failureFn(errMsg);
-                }
+                });
             }
         });
     }

diff --git a/src/Resources/js/views/dishIndex.ts b/src/Resources/js/views/dishIndex.ts
@@ -1,4 +1,4 @@
-import Switchery from "switchery.js";
+import Switchery from 'switchery.js';
 
 export default class DishIndex {
     constructor() {

diff --git a/src/Resources/js/views/mealGuest.ts b/src/Resources/js/views/mealGuest.ts
@@ -1,7 +1,7 @@
-import {ParticipationGuestToggleHandler} from "../modules/participation-toggle-handler";
-import {ParticipationPreToggleHandler} from "../modules/participation-pre-toggle-handler";
-import {ParticipationUpdateHandler} from "../modules/participation-update-handler";
-import {SlotAllocationUpdateHandler} from "../modules/slot-allocation-update-handler";
+import {ParticipationGuestToggleHandler} from '../modules/participation-toggle-handler';
+import {ParticipationPreToggleHandler} from '../modules/participation-pre-toggle-handler';
+import {ParticipationUpdateHandler} from '../modules/participation-update-handler';
+import {SlotAllocationUpdateHandler} from '../modules/slot-allocation-update-handler';
 
 export default class MealGuestView {
     $participationCheckboxes: JQuery;

diff --git a/src/Resources/js/views/mealIndex.ts b/src/Resources/js/views/mealIndex.ts
@@ -1,13 +1,14 @@
-import {ParticipationPreToggleHandler} from "../modules/participation-pre-toggle-handler";
-import {ParticipationToggleHandler} from "../modules/participation-toggle-handler";
-import {CombinedMealDialog, SerializedFormData} from "../modules/combined-meal-dialog";
-import {ParticipationRequest, ParticipationRequestHandler} from "../modules/participation-request-handler";
-import {ParticipationResponse} from "../modules/participation-response-handler";
-import {CombinedMealService} from "../modules/combined-meal-service";
-import {MealOfferUpdate, MealOfferUpdateHandler} from "../modules/meal-offer-update-handler";
-import {ParticipationUpdateHandler} from "../modules/participation-update-handler";
-import {SlotAllocationUpdateHandler} from "../modules/slot-allocation-update-handler";
-import {MealService} from "../modules/meal-service";
+import {ParticipationPreToggleHandler} from '../modules/participation-pre-toggle-handler';
+import {ParticipationToggleHandler} from '../modules/participation-toggle-handler';
+import {CombinedMealDialog, SerializedFormData} from '../modules/combined-meal-dialog';
+import {ParticipationRequest, ParticipationRequestHandler} from '../modules/participation-request-handler';
+import {ParticipationResponse} from '../modules/participation-response-handler';
+import {CombinedMealService} from '../modules/combined-meal-service';
+import {MealOfferUpdate, MealOfferUpdateHandler} from '../modules/meal-offer-update-handler';
+import {ParticipationUpdateHandler} from '../modules/participation-update-handler';
+import {SlotAllocationUpdateHandler} from '../modules/slot-allocation-update-handler';
+import {MealService} from '../modules/meal-service';
+import AjaxErrorHandler from '../modules/ajax-error-handler';
 
 interface UpdateResponse extends ParticipationResponse {
     bookedDishSlugs: string[];
@@ -78,8 +79,8 @@ export default class MealIndexView {
                     // hide default option to auto-select slot [TP##250006]
                     $slotSelector.find('option[value=""]').hide()
                 },
-                error: function () {
-                    alert('An unknown error occurred');
+                error: function (jqXHR) {
+                    AjaxErrorHandler.handleError(jqXHR);
                 }
             });
         }