#366: Continued work on implementing calls to get available intervals

Author: tuj

.env

@@ -41,19 +41,25 @@ CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###> App ###
 APP_DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
 APP_ACTIVATION_CODE_EXPIRE_INTERNAL=P2D
+APP_KEY_VAULT_SOURCE=ENVIRONMENT
+APP_KEY_VAULT_JSON="{}"
 ###< App ###
 
 ###> lexik/jwt-authentication-bundle ###
 JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
 JWT_PASSPHRASE=APP_JWT_PASSPHRASE
-JWT_TOKEN_TTL=3600 # 1 hour
-JWT_SCREEN_TOKEN_TTL=1296000 # 15 days
+# 1 hour
+JWT_TOKEN_TTL=3600
+# 15 days
+JWT_SCREEN_TOKEN_TTL=1296000
 ###< lexik/jwt-authentication-bundle ###
 
 ###> gesdinet/jwt-refresh-token-bundle ###
-JWT_REFRESH_TOKEN_TTL=7200 # 2 hours
-JWT_SCREEN_REFRESH_TOKEN_TTL=2592000 # 30 days
+# 2 hours
+JWT_REFRESH_TOKEN_TTL=7200
+# 30 days
+JWT_SCREEN_REFRESH_TOKEN_TTL=2592000
 ###< gesdinet/jwt-refresh-token-bundle ###
 
 ###> itk-dev/openid-connect-bundle ###
@@ -75,6 +81,7 @@ EXTERNAL_OIDC_REDIRECT_URI=EXTERNAL_OIDC_REDIRECT_URI
 EXTERNAL_OIDC_LEEWAY=30
 EXTERNAL_OIDC_HASH_SALT=
 EXTERNAL_OIDC_CLAIM_ID=signinname
+###< itk-dev/openid-connect-bundle ###
 
 # cli redirect url
 OIDC_CLI_REDIRECT=APP_CLI_REDIRECT_URI
@@ -84,3 +91,4 @@ OIDC_CLI_REDIRECT=APP_CLI_REDIRECT_URI
 REDIS_CACHE_PREFIX=DisplayApiService
 REDIS_CACHE_DSN=redis://redis:6379/0
 ###< redis ###
+

.env.test

@@ -11,11 +11,11 @@ DATABASE_URL="mysql://root:password@mariadb:3306/db_test?serverVersion=mariadb-1
 JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
 JWT_PASSPHRASE=APP_JWT_PASSPHRASE
-JWT_TOKEN_TTL=1800 # 30 min
-JWT_SCREEN_TOKEN_TTL=43200 # 12 hours
+JWT_TOKEN_TTL=1800
+JWT_SCREEN_TOKEN_TTL=43200
 ###< lexik/jwt-authentication-bundle ###
 
 ###> gesdinet/jwt-refresh-token-bundle ###
-JWT_REFRESH_TOKEN_TTL=3600 # 1 hour
-JWT_SCREEN_REFRESH_TOKEN_TTL=86400 # 24 hours
+JWT_REFRESH_TOKEN_TTL=3600
+JWT_SCREEN_REFRESH_TOKEN_TTL=86400
 ###< gesdinet/jwt-refresh-token-bundle ###

config/services.yaml

@@ -51,6 +51,11 @@ services:
     Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface: '@Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationFailureHandler'
     Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface: '@Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler'
 
+    App\Service\KeyVaultService:
+        arguments:
+            $keyVaultSource: '%env(string:APP_KEY_VAULT_SOURCE)%'
+            $keyVaultArray: '%env(json:APP_KEY_VAULT_JSON)%'
+
     App\Service\UserService:
         arguments:
             $hashSalt: '%env(EXTERNAL_OIDC_HASH_SALT)%'

migrations/Version20240227095949.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240227095949 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE interactive ADD version INT DEFAULT 1 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE interactive DROP version');
+    }
+}

src/Command/Tenant/ConfigureTenantCommand.php

@@ -80,17 +80,17 @@ final protected function execute(InputInterface $input, OutputInterface $output)
             foreach ($configurables as $interactiveClass => $configurable) {
                 $question = new ConfirmationQuestion('Configure '.$interactiveClass.' (y/n)?', false);
                 if ($helper->ask($input, $output, $question)) {
-                    $io->info("Configuring ".$interactiveClass);
+                    $io->info('Configuring '.$interactiveClass);
 
                     $configuration = [];
 
                     foreach ($configurable as $key => $data) {
-                        $value = $io->ask($key . ' (' . $data['description'] . ')');
+                        $value = $io->ask($key.' ('.$data['description'].')');
 
                         $configuration[$key] = $value;
                     }
 
-                    $this->interactiveService->saveConfiguration($tenant, (string)$interactiveClass, $configuration);
+                    $this->interactiveService->saveConfiguration($tenant, (string) $interactiveClass, $configuration);
                 }
             }
         }

src/Controller/AuthOidcController.php

@@ -12,6 +12,7 @@
 use Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;

src/Controller/InteractiveController.php

@@ -6,6 +6,7 @@
 
 use App\Entity\Tenant\Slide;
 use App\Service\InteractiveService;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -14,7 +15,8 @@
 final readonly class InteractiveController
 {
     public function __construct(
-        private InteractiveService $interactiveSlideService
+        private InteractiveService $interactiveSlideService,
+        private Security $security,
     ) {}
 
     public function __invoke(Request $request, Slide $slide): JsonResponse
@@ -23,6 +25,8 @@ public function __invoke(Request $request, Slide $slide): JsonResponse
 
         $interaction = $this->interactiveSlideService->parseRequestBody($requestBody);
 
-        return new JsonResponse($this->interactiveSlideService->performAction($slide, $interaction));
+        $user = $this->security->getUser();
+
+        return new JsonResponse($this->interactiveSlideService->performAction($user, $slide, $interaction));
     }
 }

src/Dto/InteractiveSlideActionInput.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Dto;
 
 class InteractiveSlideActionInput

src/Entity/Tenant/Interactive.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Entity\Tenant;
 
 use App\Repository\InteractiveRepository;

src/Exceptions/InteractiveException.php

@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Exceptions;
 
 class InteractiveException extends \Exception
 {
-
 }

src/Interactive/InteractionRequest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interactive;
 
 readonly class InteractionRequest

src/Interactive/InteractiveInterface.php

@@ -1,11 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interactive;
 
 use App\Entity\Tenant\Slide;
+use App\Exceptions\InteractiveException;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 interface InteractiveInterface
 {
     public function getConfigOptions(): array;
-    public function performAction(Slide $slide, InteractionRequest $interactionRequest): array;
+
+    /**
+     * Perform the given InteractionRequest with the given Slide.
+     *
+     * @throws InteractiveException
+     */
+    public function performAction(UserInterface $user, Slide $slide, InteractionRequest $interactionRequest): array;
 }