Merge pull request #1126 from LordSimal/15.next-cake5

fix token mail not working with custom Controller config + fix tests failing with latest cake

Author: steinkel

src/Mailer/UsersMailer.php

@@ -15,7 +15,6 @@
 use Cake\Datasource\EntityInterface;
 use Cake\Mailer\Mailer;
 use Cake\Mailer\Message;
-use Cake\Routing\Router;
 use CakeDC\Users\Utility\UsersUrl;
 
 /**
@@ -139,13 +138,12 @@ protected function socialAccountValidation(EntityInterface $user, EntityInterfac
     public function sendToken(EntityInterface $user, string $token): void
     {
         $this->viewBuilder()->setTemplate('CakeDC/Users.onetimeToken');
-        $loginLink = Router::url([
-            'controller' => 'Users',
-            'action' => 'singleTokenLogin',
+        $loginLink = UsersUrl::actionUrl('singleTokenLogin', [
             '?' => [
                 'token' => $token,
             ],
-        ], true);
+            '_full' => true,
+        ]);
         $this->setTo($user->email);
         $this->setSubject(__d('cake_d_c/users', 'Your One-Time Login Token'));
         $this->setEmailFormat('html');

src/Model/Behavior/RegisterBehavior.php

@@ -163,7 +163,7 @@ protected function _emailValidator(Validator $validator, $validateEmail)
     {
         $this->validateEmail = (bool)$validateEmail;
         $validator
-            ->add('email', 'valid', ['rule' => 'email'])
+            ->add('email', 'valid_email', ['rule' => 'email'])
             ->notBlank('email', __d('cake_d_c/users', 'This field is required'), function ($context) {
                 return $this->validateEmail;
             });
@@ -197,8 +197,7 @@ public function getRegisterValidators($options)
         $validateEmail = $options['validate_email'] ?? null;
         $useTos = $options['use_tos'] ?? null;
 
-        $validator = $this->_table->validationDefault(new Validator());
-        $validator = $this->_table->validationRegister($validator);
+        $validator = $this->_table->validationRegister(new Validator());
         if ($useTos) {
             $validator = $this->_tosValidator($validator);
         }

src/Model/Table/SocialAccountsTable.php

@@ -59,7 +59,7 @@ public function initialize(array $config): void
     public function validationDefault(Validator $validator): Validator
     {
         $validator
-            ->add('id', 'valid', ['rule' => 'uuid'])
+            ->add('id', 'valid_id', ['rule' => 'uuid'])
             ->allowEmptyString('id', null, 'create');
 
         $validator
@@ -91,11 +91,11 @@ public function validationDefault(Validator $validator): Validator
             ->allowEmptyString('token_secret');
 
         $validator
-            ->add('token_expires', 'valid', ['rule' => 'datetime'])
+            ->add('token_expires', 'valid_social_token_expires', ['rule' => 'datetime'])
             ->allowEmptyString('token_expires');
 
         $validator
-            ->add('active', 'valid', ['rule' => 'boolean'])
+            ->add('active', 'valid_active', ['rule' => 'boolean'])
             ->requirePresence('active', 'create')
             ->notBlank('active');
 

src/Model/Table/UsersTable.php

@@ -160,18 +160,18 @@ public function validationDefault(Validator $validator): Validator
             ->allowEmptyString('token');
 
         $validator
-            ->add('token_expires', 'valid', ['rule' => 'datetime'])
+            ->add('token_expires', 'valid_user_token_expires', ['rule' => 'datetime'])
             ->allowEmptyDateTime('token_expires');
 
         $validator
             ->allowEmptyString('api_token');
 
         $validator
-            ->add('activation_date', 'valid', ['rule' => 'datetime'])
+            ->add('activation_date', 'valid_activation_date', ['rule' => 'datetime'])
             ->allowEmptyDateTime('activation_date');
 
         $validator
-            ->add('tos_date', 'valid', ['rule' => 'datetime'])
+            ->add('tos_date', 'valid_tos_date', ['rule' => 'datetime'])
             ->allowEmptyDateTime('tos_date');
 
         return $validator;