Merge branch '2.4-develop' into 2.4

mageplaza · Apr 19, 2022 · e1936be · e1936be
2 parents 6043fca + 9d831be
commit e1936be
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/Model/Resolver/Bestsellers/Bestsellers.php b/Model/Resolver/Bestsellers/Bestsellers.php
@@ -115,8 +115,15 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!$this->helperData->isEnabled()) {
-            throw new GraphQlInputException(__('Smtp is disabled.'));
+        if (!$this->helperEmailMarketing->isEnableEmailMarketing()) {
+            throw new GraphQlInputException(__('Marketing automation is disabled.'));
+        }
+
+        $appId     = $args['app_id'];
+        $secretKey = $args['secret_key'];
+        if (!($this->helperEmailMarketing->getAppID() === $appId &&
+            $this->helperEmailMarketing->getSecretKey() === $secretKey)) {
+            throw new GraphQlInputException(__('Invalid app id or secret key.'));
         }
 
         $filters       = $args['filters'];

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "mageplaza/module-core": "^1.4.11"
   },
   "type": "magento2-module",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "license": "proprietary",
   "authors": [
     {

diff --git a/etc/schema.graphqls b/etc/schema.graphqls
@@ -17,7 +17,7 @@
 # @license     https://www.mageplaza.com/LICENSE.txt
 
 type Query {
-    mpSmtpBestsellers (filters: MpFilters): SmtpBestsellersOutput @resolver(class: "Mageplaza\\Smtp\\Model\\Resolver\\Bestsellers\\Bestsellers") @doc(description: "Searches for Best Sellers information matches the filter.")
+    mpSmtpBestsellers (app_id: String!,secret_key: String!,filters: MpFilters): SmtpBestsellersOutput @resolver(class: "Mageplaza\\Smtp\\Model\\Resolver\\Bestsellers\\Bestsellers") @doc(description: "Searches for Best Sellers information matches the filter.")
 }
 
 input MpFilters {

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -204,3 +204,5 @@ Bcc,Bcc
 "Smtp is disabled.","Smtp is disabled."
 "From and To fields are required.","From and To fields are required."
 "The store with store ID is %d doesn't exist.","The store with store ID is %d doesn't exist."
+"Marketing automation is disabled.","Marketing automation is disabled."
+"Invalid app id or secret key.","Invalid app id or secret key."