Merge pull request #1629 from ConductionNL/feature/BEL-26/api-key-app…

…lication With ApiKey for auth, make sure we set application in session correctly
ConductionNL · Mar 21, 2024 · aa6486a · aa6486a
2 parents 4cd5eb3 + 5e8bb47
commit aa6486a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/api/src/Security/ApiKeyAuthenticator.php b/api/src/Security/ApiKeyAuthenticator.php
@@ -101,7 +101,7 @@ public function authenticate(Request $request): PassportInterface
         }
 
         // Set apiKey Application id in session
-        $this->session->set('apiKeyApplication', $application->getId()->toString());
+        $this->session->set('application', $application->getId()->toString());
 
         // Set organization id and user id in session
         $this->session->set('user', $user->getId()->toString());

diff --git a/api/src/Service/ApplicationService.php b/api/src/Service/ApplicationService.php
@@ -44,15 +44,6 @@ public function getApplication(): Application
             }
         }
 
-        // If an api-key is used for authentication we already know which application is used
-        if ($this->session->has('apiKeyApplication')) {
-            $application = $this->entityManager->getRepository('App:Application')->findOneBy(['id' => $this->session->get('apiKeyApplication')]);
-            if ($application !== null) {
-                $this->session->set('application', $application->getId()->toString());
-                return $application;
-            }
-        }
-
         // Find application using the publicKey
         $public = ($this->request->headers->get('public') ?? $this->request->query->get('public'));
         if (empty($public) === false) {