From 469b9bf85fd5a2c7aa60efc249bfb47a8adbc9d7 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta.wolny@automattic.com>
Date: Thu, 27 Apr 2023 11:11:58 +0200
Subject: [PATCH] Remove unnecessary premium key refresh when volume limit
 error happens

The limit is stored in and read from MSS key state and now we preserve
state data even when the key becomes underprivileged.
We don't need to refresh anything and also the checking underprivileged key
would return 403 and no data about limits.
[MAILPOET-5191]
---
 .../Methods/ErrorMappers/MailPoetMapper.php     | 17 -----------------
 .../Methods/ErrorMappers/MailPoetMapperTest.php |  4 ----
 2 files changed, 21 deletions(-)

diff --git a/mailpoet/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/mailpoet/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
index 1df50d084e..48fc5008a9 100644
--- a/mailpoet/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
+++ b/mailpoet/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
@@ -7,9 +7,7 @@ use MailPoet\Config\ServicesChecker;
 use MailPoet\Mailer\Mailer;
 use MailPoet\Mailer\MailerError;
 use MailPoet\Mailer\SubscriberError;
-use MailPoet\Services\Bridge;
 use MailPoet\Services\Bridge\API;
-use MailPoet\Settings\SettingsController;
 use MailPoet\Util\Helpers;
 use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
 use MailPoet\Util\Notices\UnauthorizedEmailNotice;
@@ -24,9 +22,6 @@ class MailPoetMapper {
 
   const TEMPORARY_UNAVAILABLE_RETRY_INTERVAL = 300; // seconds
 
-  /** @var Bridge */
-  private $bridge;
-
   /** @var ServicesChecker */
   private $servicesChecker;
 
@@ -36,21 +31,14 @@ class MailPoetMapper {
   /** @var WPFunctions */
   private $wp;
 
-  /** @var SettingsController */
-  private $settings;
-
   public function __construct(
-    Bridge $bridge,
     ServicesChecker $servicesChecker,
-    SettingsController $settings,
     SubscribersFeature $subscribers,
     WPFunctions $wp
   ) {
     $this->servicesChecker = $servicesChecker;
     $this->subscribersFeature = $subscribers;
     $this->wp = $wp;
-    $this->bridge = $bridge;
-    $this->settings = $settings;
   }
 
   public function getInvalidApiKeyError() {
@@ -264,11 +252,6 @@ class MailPoetMapper {
     }
 
     if ($result['error'] === API::ERROR_MESSAGE_EMAIL_VOLUME_LIMIT_REACHED) {
-      // Update the current email volume limit from MSS
-      $premiumKey = $this->settings->get(Bridge::PREMIUM_KEY_SETTING_NAME);
-      $result = $this->bridge->checkPremiumKey($premiumKey);
-      $this->bridge->storePremiumKeyAndState($premiumKey, $result);
-
       $operation = MailerError::OPERATION_EMAIL_LIMIT_REACHED;
       $message = $this->getEmailVolumeLimitReachedMessage();
       return [$operation, $message];
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
index e6eb60c2b7..95307870e5 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
@@ -6,9 +6,7 @@ use Codeception\Stub;
 use MailPoet\Config\ServicesChecker;
 use MailPoet\Mailer\MailerError;
 use MailPoet\Mailer\Methods\ErrorMappers\MailPoetMapper;
-use MailPoet\Services\Bridge;
 use MailPoet\Services\Bridge\API;
-use MailPoet\Settings\SettingsController;
 use MailPoet\Util\License\Features\Subscribers;
 use MailPoet\WP\Functions as WPFunctions;
 
@@ -30,9 +28,7 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
       },
     ]);
     $this->mapper = new MailPoetMapper(
-      Stub::make(Bridge::class),
       Stub::make(ServicesChecker::class),
-      Stub::make(SettingsController::class),
       Stub::make(Subscribers::class),
       $wpFunctions
     );