Merge pull request #6937 from ChurchCRM/bug/kiosk-401

src/kiosk/index.php

@@ -11,15 +11,21 @@
 use ChurchCRM\model\ChurchCRM\KioskDeviceQuery;
 use Slim\Factory\AppFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use ChurchCRM\Slim\Middleware\AuthMiddleware;
+use ChurchCRM\Slim\Middleware\VersionMiddleware;
 
 $container = new ContainerBuilder();
 AppFactory::setContainer($container);
 $app = AppFactory::create();
 $app->setBasePath($rootPath . '/kiosk');
 
-if (SystemConfig::debugEnabled()) {
-    $app->addErrorMiddleware(true, true, true);
-}
+$app->add(VersionMiddleware::class);
+$app->add(AuthMiddleware::class);
+$app->addBodyParsingMiddleware();
+
+// Set up
+require __DIR__ . '/../Include/slim/error-handler.php';
+
 
 // Set up
 require __DIR__ . '/../Include/slim/error-handler.php';
@@ -33,26 +39,28 @@
     $g = hash('sha256', $_COOKIE['kioskCookie']);
     $Kiosk = KioskDeviceQuery::create()
           ->findOneByGUIDHash($g);
+
+    $app->kiosk = $Kiosk;
     if ($Kiosk === null) {
         setcookie('kioskCookie', '', ['expires' => time() - 3600]);
         header('Location: ' . $_SERVER['REQUEST_URI']);
     }
-}
-
-if (!isset($_COOKIE['kioskCookie'])) {
+} else {
     if ($windowOpen) {
         $guid = uniqid();
         setcookie('kioskCookie', $guid, ['expires' => 2_147_483_647]);
         $Kiosk = new KioskDevice();
         $Kiosk->setGUIDHash(hash('sha256', $guid));
         $Kiosk->setAccepted(false);
         $Kiosk->save();
+
+        $app->kiosk = $Kiosk;
     } else {
         header('HTTP/1.1 401 Unauthorized');
         exit;
     }
 }
-$app->kiosk = $Kiosk;
+
 
 // Run app
 $app->run();