Added dependency injection

Author: rimi-itk

os2forms_rest_api.services.yml

@@ -4,6 +4,7 @@ services:
       - '@entity_type.manager'
       - '@current_user'
       - '@key_auth.authentication.key_auth'
+      - '@request_stack'
 
   Drupal\os2forms_rest_api\EventSubscriber\EventSubscriber:
     arguments:

src/WebformHelper.php

@@ -10,6 +10,7 @@
 use Drupal\key_auth\Authentication\Provider\KeyAuth;
 use Drupal\webform\WebformInterface;
 use Drupal\webform\WebformSubmissionInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Webform helper for helping with webforms.
@@ -38,13 +39,21 @@ class WebformHelper {
    */
   private KeyAuth $keyAuth;
 
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  private RequestStack $requestStack;
+
   /**
    * Constructor.
    */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, AccountProxyInterface $currentUser, KeyAuth $keyAuth) {
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, AccountProxyInterface $currentUser, KeyAuth $keyAuth, RequestStack $requestStack) {
     $this->entityTypeManager = $entityTypeManager;
     $this->currentUser = $currentUser;
     $this->keyAuth = $keyAuth;
+    $this->requestStack = $requestStack;
   }
 
   /**
@@ -244,7 +253,7 @@ private function loadUsers(array $spec): array {
    * @phpstan-return int|array<string, string>|null
    */
   public function fileDownload(string $uri) {
-    $request = \Drupal::request();
+    $request = $this->requestStack->getCurrentRequest();
 
     if ($user = $this->keyAuth->authenticate($request)) {
       // Find webform id from uri, see example uri.