From 13747c75025e44b30e2e894d896301d40111fe25 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:57:31 +0100
Subject: [PATCH] Lazily get user context if we should be able to (#152)

---
 Model/SentryInteraction.php | 48 ++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/Model/SentryInteraction.php b/Model/SentryInteraction.php
index 44e7471..2d152cb 100644
--- a/Model/SentryInteraction.php
+++ b/Model/SentryInteraction.php
@@ -21,14 +21,17 @@
 
 class SentryInteraction
 {
+    /**
+     * @var ?UserContextInterface
+     */
+    private ?UserContextInterface $userContext = null;
+
     /**
      * SentryInteraction constructor.
      *
-     * @param UserContextInterface $userContext
-     * @param State                $appState
+     * @param State $appState
      */
     public function __construct(
-        private UserContextInterface $userContext,
         private State $appState
     ) {
     }
@@ -45,10 +48,37 @@ public function initialize($config)
         init($config);
     }
 
+    /**
+     * Check if we might be able to get user context.
+     */
+    public function canGetUserContext()
+    {
+        try {
+            // @phpcs:ignore Generic.PHP.NoSilencedErrors
+            return in_array(@$this->appState->getAreaCode(), [Area::AREA_ADMINHTML, Area::AREA_FRONTEND, Area::AREA_WEBAPI_REST, Area::AREA_WEBAPI_SOAP, Area::AREA_GRAPHQL]);
+        } catch (LocalizedException $ex) {
+            return false;
+        }
+    }
+
+    /**
+     * Attempt to get userContext from the objectManager, so we don't request it too early.
+     */
+    public function getUserContext(): ?UserContextInterface
+    {
+        if ($this->userContext) {
+            return $this->userContext;
+        }
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+
+        return $this->userContext = $objectManager->get(UserContextInterface::class);
+    }
+
     /**
      * Check if we might be able to get the user data.
      */
-    private function canGetUserData()
+    public function canGetUserData()
     {
         try {
             // @phpcs:ignore Generic.PHP.NoSilencedErrors
@@ -120,12 +150,14 @@ public function addUserContext()
         \Magento\Framework\Profiler::start('SENTRY::add_user_context');
 
         try {
-            $userId = $this->userContext->getUserId();
-            if ($userId) {
-                $userType = $this->userContext->getUserType();
+            if ($this->canGetUserContext()) {
+                $userId = $this->getUserContext()->getUserId();
+                if ($userId) {
+                    $userType = $this->getUserContext()->getUserType();
+                }
             }
 
-            if ($this->canGetUserData() && count($userData = $this->getSessionUserData())) {
+            if (count($userData = $this->getSessionUserData())) {
                 $userId = $userData['id'] ?? $userId;
                 $userType = $userData['user_type'] ?? $userType;
                 unset($userData['user_type']);