Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Initialize session when no ID exists

Browse Source 
[MAILPOET-4514]
This commit is contained in:
David Remer
2022-07-28 13:34:13 +03:00
committed by Aschepikov
parent 223625bd9b
commit f5c678ec2d
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mailpoet/lib/Subscription/Captcha/CaptchaSession.php
View File

@ -15,8 +15,8 @@ class CaptchaSession {
/** @var WPFunctions */ /** @var WPFunctions */
private $wp; private $wp;
/** @var ?string */ /** @var string */
private $id = null; private $id = '';
public function __construct( public function __construct(
WPFunctions $wp WPFunctions $wp
@ -24,11 +24,14 @@ class CaptchaSession {
$this->wp = $wp; $this->wp = $wp;
} }
public function init($id = null) { public function init(string $id = null) {
$this->id = $id ?: Security::generateRandomString(self::ID_LENGTH); $this->id = $id ?: Security::generateRandomString(self::ID_LENGTH);
} }
public function getId(): ?string { public function getId(): string {
if (!$this->id) {
$this->init();
}
return $this->id; return $this->id;
} }

13
mailpoet/lib/Subscription/Captcha/Validator/BuiltInCaptchaValidator.php
View File

@ -56,7 +56,7 @@ class BuiltInCaptchaValidator implements CaptchaValidator {
throw new ValidationError( throw new ValidationError(
__('Please fill in the CAPTCHA.', 'mailpoet'), __('Please fill in the CAPTCHA.', 'mailpoet'),
[ [
'redirect_url' => $this->subscriptionUrlFactory->getCaptchaUrl($this->getSessionId()), 'redirect_url' => $this->subscriptionUrlFactory->getCaptchaUrl($this->captchaSession->getId()),
] ]
); );
} }
@ -65,7 +65,7 @@ class BuiltInCaptchaValidator implements CaptchaValidator {
throw new ValidationError( throw new ValidationError(
__('Please regenerate the CAPTCHA.', 'mailpoet'), __('Please regenerate the CAPTCHA.', 'mailpoet'),
[ [
'redirect_url' => $this->subscriptionUrlFactory->getCaptchaUrl($this->getSessionId()), 'redirect_url' => $this->subscriptionUrlFactory->getCaptchaUrl($this->captchaSession->getId()),
] ]
); );
} }
@ -84,15 +84,6 @@ class BuiltInCaptchaValidator implements CaptchaValidator {
} }
private function getSessionId() {
$id = $this->captchaSession->getId();
if ($id === null) {
$this->captchaSession->init();
$id = $this->captchaSession->getId();
}
return $id;
}
public function isRequired($subscriberEmail = null) { public function isRequired($subscriberEmail = null) {
if ($this->isUserExemptFromCaptcha()) { if ($this->isUserExemptFromCaptcha()) {
return false; return false;