diff --git a/src/Model/Behavior/RegisterBehavior.php b/src/Model/Behavior/RegisterBehavior.php index 96cb8ce9..3e8b464c 100644 --- a/src/Model/Behavior/RegisterBehavior.php +++ b/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); } diff --git a/src/Model/Table/SocialAccountsTable.php b/src/Model/Table/SocialAccountsTable.php index f10397c0..41ee74b8 100644 --- a/src/Model/Table/SocialAccountsTable.php +++ b/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'); diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php index c2b50d5f..6d7ee1c7 100644 --- a/src/Model/Table/UsersTable.php +++ b/src/Model/Table/UsersTable.php @@ -158,18 +158,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;