Merge remote-tracking branch 'origin/2.4-develop' into 2.4

# Conflicts:
#	view/frontend/templates/popup/form/authentication/social.phtml

Block/Css.php

@@ -67,7 +67,12 @@ protected function _prepareLayout()
                 $this->pageConfig->addPageAsset('Mageplaza_Core::css/magnific-popup.css');
             } elseif (in_array(
                 $this->_request->getFullActionName(),
-                ['customer_account_login', 'customer_account_create', 'customer_account_index']
+                [
+                    'customer_account_login',
+                    'customer_account_create',
+                    'customer_account_index',
+                    'customer_account_forgotpassword'
+                ]
             )
             ) {
                 $this->pageConfig->addPageAsset('Mageplaza_SocialLogin::css/style.css');

Block/Popup.php

@@ -66,6 +66,10 @@ public function __construct(
      */
     public function isEnabled()
     {
+        if (str_contains($this->_request->getFullActionName(), 'customer_account')) {
+            return false;
+        }
+
         if ($this->helperData->isEnabled() && !$this->customerSession->isLoggedIn() && $this->helperData->getPopupLogin()) {
             return $this->helperData->getPopupLogin();
         }
@@ -165,7 +169,7 @@ public function getCreateFormUrl()
      */
     public function isSecure()
     {
-        return (bool)$this->helperData->isSecure();
+        return (bool) $this->helperData->isSecure();
     }
 
     /**
@@ -189,6 +193,6 @@ public function isRequireMoreInfo()
      */
     public function isCheckMode()
     {
-        return (bool)$this->helperData->isCheckMode();
+        return (bool) $this->helperData->isCheckMode();
     }
 }

Block/Popup/Social.php

@@ -114,12 +114,23 @@ public function getSocialButtonsConfig()
     public function canShow($position = null)
     {
         $displayConfig = $this->socialHelper->getConfigGeneral('social_display');
-        $displayConfig = explode(',', $displayConfig);
+        $displayConfig = explode(',', $displayConfig ?? '');
 
         if (!$position) {
-            $position = $this->getRequest()->getFullActionName() === 'customer_account_login' ?
-                Position::PAGE_LOGIN :
-                Position::PAGE_CREATE;
+            $controllerName = $this->getRequest()->getFullActionName();
+            switch ($controllerName) {
+                case 'customer_account_login':
+                    $position = Position::PAGE_LOGIN;
+                    break;
+                case 'customer_account_forgotpassword':
+                    $position = Position::PAGE_FORGOT_PASS;
+                    break;
+                case 'customer_account_create':
+                    $position = Position::PAGE_CREATE;
+                    break;
+                default:
+                    return false;
+            }
         }
 
         return in_array($position, $displayConfig);

Controller/Popup/Create.php

@@ -24,16 +24,34 @@
 use Exception;
 use Magento\Captcha\Helper\Data as CaptchaData;
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Controller\Account\CreatePost;
+use Magento\Customer\Helper\Address;
+use Magento\Customer\Model\Account\Redirect as AccountRedirect;
+use Magento\Customer\Model\CustomerExtractor;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Customer\Model\Registration;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+use Magento\Framework\UrlFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Mageplaza\SocialLogin\Helper\Data;
 
 /**
@@ -69,14 +87,83 @@ class Create extends CreatePost
     private $cookieMetadataFactory;
 
     /**
-     * @return JsonFactory|mixed
+     * Create constructor.
+     *
+     * @param Context $context
+     * @param Session $customerSession
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param AccountManagementInterface $accountManagement
+     * @param Address $addressHelper
+     * @param UrlFactory $urlFactory
+     * @param FormFactory $formFactory
+     * @param SubscriberFactory $subscriberFactory
+     * @param RegionInterfaceFactory $regionDataFactory
+     * @param AddressInterfaceFactory $addressDataFactory
+     * @param CustomerInterfaceFactory $customerDataFactory
+     * @param CustomerUrl $customerUrl
+     * @param Registration $registration
+     * @param Escaper $escaper
+     * @param CustomerExtractor $customerExtractor
+     * @param DataObjectHelper $dataObjectHelper
+     * @param AccountRedirect $accountRedirect
+     * @param CustomerRepository $customerRepository
+     * @param JsonFactory $jsonFactory
+     * @param Validator|null $formKeyValidator
+     */
+    public function __construct(
+        Context $context,
+        Session $customerSession,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        AccountManagementInterface $accountManagement,
+        Address $addressHelper,
+        UrlFactory $urlFactory,
+        FormFactory $formFactory,
+        SubscriberFactory $subscriberFactory,
+        RegionInterfaceFactory $regionDataFactory,
+        AddressInterfaceFactory $addressDataFactory,
+        CustomerInterfaceFactory $customerDataFactory,
+        CustomerUrl $customerUrl,
+        Registration $registration,
+        Escaper $escaper,
+        CustomerExtractor $customerExtractor,
+        DataObjectHelper $dataObjectHelper,
+        AccountRedirect $accountRedirect,
+        CustomerRepository $customerRepository,
+        JsonFactory $jsonFactory,
+        Validator $formKeyValidator = null
+    ) {
+        parent::__construct(
+            $context,
+            $customerSession,
+            $scopeConfig,
+            $storeManager,
+            $accountManagement,
+            $addressHelper,
+            $urlFactory,
+            $formFactory,
+            $subscriberFactory,
+            $regionDataFactory,
+            $addressDataFactory,
+            $customerDataFactory,
+            $customerUrl,
+            $registration,
+            $escaper,
+            $customerExtractor,
+            $dataObjectHelper,
+            $accountRedirect,
+            $customerRepository,
+            $formKeyValidator
+        );
+        $this->resultJsonFactory = $jsonFactory;
+    }
+
+    /**
+     * @return JsonFactory
      */
     protected function getJsonFactory()
     {
-        if (!$this->resultJsonFactory) {
-            $this->resultJsonFactory = ObjectManager::getInstance()->get(JsonFactory::class);
-        }
-
         return $this->resultJsonFactory;
     }
 
@@ -125,9 +212,6 @@ public function checkCaptcha()
      */
     public function execute()
     {
-        /**
-         * @var Json $resultJson
-         */
         $resultJson = $this->getJsonFactory()->create();
         $result     = [
             'success' => false,

Controller/Popup/Forgot.php

@@ -36,9 +36,9 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\SecurityViolationException;
+use Magento\Framework\Validator\ValidateException;
+use Magento\Framework\Validator\ValidatorChain;
 use Mageplaza\SocialLogin\Helper\Data;
-use Zend_Validate;
-use Zend_Validate_Exception;
 
 /**
  * Class Forgot
@@ -118,22 +118,19 @@ public function checkCaptcha()
     }
 
     /**
-     * @return $this|ResponseInterface|ResultInterface
-     * @throws Zend_Validate_Exception
+     * @return ResponseInterface|Json|ResultInterface
+     * @throws ValidateException
      */
     public function execute()
     {
-        /**
-         * @var Json $resultJson
-         */
         $resultJson = $this->resultJsonFactory->create();
 
         $result = [
             'success' => false,
             'message' => []
         ];
 
-        if (!$this->checkCaptcha()) {
+        if (!$this->socialHelper->isEnabledGGRecaptcha() && !$this->checkCaptcha()) {
             $result['message'] = __('Incorrect CAPTCHA.');
 
             return $resultJson->setData($result);
@@ -142,10 +139,10 @@ public function execute()
         /**
          * @var Redirect $resultRedirect
          */
-        $email = (string)$this->getRequest()->getPost('email');
+        $email = (string) $this->getRequest()->getPost('email');
 
         if ($email) {
-            if (!Zend_Validate::is($email, 'EmailAddress')) {
+            if (!ValidatorChain::is($email, 'EmailAddress')) {
                 $this->session->setForgottenEmail($email);
                 $result['message'][] = __('Please correct the email address.');
             }

Helper/Data.php

@@ -152,7 +152,7 @@ public function getPopupLogin($storeId = null)
     /**
      * @param null $storeId
      *
-     * @return mixed
+     * @return bool
      */
     public function isCheckMode($storeId = null)
     {

Model/System/Config/Source/Position.php

@@ -30,10 +30,12 @@
  */
 class Position implements ArrayInterface
 {
-    const PAGE_LOGIN  = 1;
-    const PAGE_CREATE = 2;
-    const PAGE_POPUP  = 3;
-    const PAGE_AUTHEN = 4;
+    const PAGE_LOGIN       = 1;
+    const PAGE_CREATE      = 2;
+    const PAGE_POPUP       = 3;
+    const PAGE_AUTHEN      = 4;
+    const PAGE_FORGOT_PASS = 5;
+
 
     /**
      * Options getter
@@ -46,6 +48,7 @@ public function toOptionArray()
             ['value' => '', 'label' => __('-- Please Select --')],
             ['value' => self::PAGE_LOGIN, 'label' => __('Customer Login Page')],
             ['value' => self::PAGE_CREATE, 'label' => __('Customer Create Page')],
+            ['value' => self::PAGE_FORGOT_PASS, 'label' => __('Forgot Your Password Page')],
             ['value' => self::PAGE_POPUP, 'label' => __('Social Login Popup')],
             ['value' => self::PAGE_AUTHEN, 'label' => __('Customer Authentication Popup')]
         ];