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

Remove Subscriber::generateToken()

Browse Source 
[MAILPOET-2340]
This commit is contained in:
Amine Ben hammou
2019-09-19 17:04:35 +01:00
committed by Jack Kitterhing
parent 692ff1ed22
commit bc31ca6c6d
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Models/Subscriber.php
View File

@ -115,20 +115,6 @@ class Subscriber extends Model {
return self::where('wp_user_id', $wp_user->ID)->findOne(); return self::where('wp_user_id', $wp_user->ID)->findOne();
} }
/**
* Only for backward compatibility for old tokens
*/
static function generateToken($email = null, $length = self::OBSOLETE_LINK_TOKEN_LENGTH) {
if ($email !== null) {
$auth_key = '';
if (defined('AUTH_KEY')) {
$auth_key = AUTH_KEY;
}
return substr(md5($auth_key . $email), 0, $length);
}
return false;
}
function verifyToken($token) { function verifyToken($token) {
$database_token = (new LinkTokens)->getToken($this); $database_token = (new LinkTokens)->getToken($this);
$request_token = substr($token, 0, strlen($database_token)); $request_token = substr($token, 0, strlen($database_token));

2
lib/Subscription/Pages.php
View File

@ -288,7 +288,7 @@ class Pages {
'email' => self::DEMO_EMAIL, 'email' => self::DEMO_EMAIL,
'first_name' => 'John', 'first_name' => 'John',
'last_name' => 'Doe', 'last_name' => 'Doe',
'link_token' => Subscriber::generateToken(self::DEMO_EMAIL), 'link_token' => 'bfd0889dbc7f081e171fa0cee7401df2',
]); ]);
} else if ($this->subscriber !== false) { } else if ($this->subscriber !== false) {
$subscriber = $this->subscriber $subscriber = $this->subscriber

2
tests/integration/Newsletter/Links/LinksTest.php
View File

@ -119,7 +119,7 @@ class LinksTest extends \MailPoetTest {
$subscriber_email = 'test@example.com'; $subscriber_email = 'test@example.com';
$data = [ $data = [
'subscriber_id' => 1, 'subscriber_id' => 1,
'subscriber_token' => Subscriber::generateToken($subscriber_email), 'subscriber_token' => md5($subscriber_email),
'queue_id' => 2, 'queue_id' => 2,
'link_hash' => 'hash', 'link_hash' => 'hash',
'preview' => false, 'preview' => false,