Merged from develop

CakeDC · Nov 16, 2018 · 07fe07d · 07fe07d
1 parent 64ddb07
commit 07fe07d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Controller/Traits/UserValidationTrait.php b/src/Controller/Traits/UserValidationTrait.php
@@ -11,12 +11,12 @@
 
 namespace CakeDC\Users\Controller\Traits;
 
-use CakeDC\Users\Controller\Component\UsersAuthComponent;
 use CakeDC\Users\Exception\TokenExpiredException;
 use CakeDC\Users\Exception\UserAlreadyActiveException;
 use CakeDC\Users\Exception\UserNotFoundException;
 use Cake\Core\Configure;
 use Cake\Http\Response;
+use CakeDC\Users\Plugin;
 use Exception;
 
 /**
@@ -69,7 +69,7 @@ public function validate($type = null, $token = null)
         } catch (UserNotFoundException $ex) {
             $this->Flash->error(__d('CakeDC/Users', 'Invalid token or user account already validated'));
         } catch (TokenExpiredException $ex) {
-            $event = $this->dispatchEvent(UsersAuthComponent::EVENT_ON_EXPIRED_TOKEN, ['type' => $type]);
+            $event = $this->dispatchEvent(Plugin::EVENT_ON_EXPIRED_TOKEN, ['type' => $type]);
             if (!empty($event) && is_array($event->result)) {
                 return $this->redirect($event->result);
             }
@@ -99,7 +99,7 @@ public function resendTokenValidation()
                 'sendEmail' => true,
                 'type' => 'email'
             ])) {
-                $event = $this->dispatchEvent(UsersAuthComponent::EVENT_AFTER_RESEND_TOKEN_VALIDATION);
+                $event = $this->dispatchEvent(Plugin::EVENT_AFTER_RESEND_TOKEN_VALIDATION);
                 if (!empty($event) && is_array($event->result)) {
                     return $this->redirect($event->result);
                 }

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -36,6 +36,9 @@ class Plugin extends BasePlugin implements AuthenticationServiceProviderInterfac
     const EVENT_AFTER_REGISTER = 'Users.Managment.afterRegister';
     const EVENT_AFTER_CHANGE_PASSWORD = 'Users.Managment.afterResetPassword';
     const EVENT_BEFORE_SOCIAL_LOGIN_USER_CREATE = 'Users.Managment.beforeSocialLoginUserCreate';
+    const EVENT_ON_EXPIRED_TOKEN = 'Users.Managment.onExpiredToken';
+    const EVENT_AFTER_RESEND_TOKEN_VALIDATION = 'Users.Managment.afterResendTokenValidation';
+
 
     /**
      * Returns an authentication service instance.

diff --git a/tests/TestCase/Controller/Traits/LoginTraitTest.php b/tests/TestCase/Controller/Traits/LoginTraitTest.php
@@ -20,7 +20,6 @@
 use CakeDC\Users\Authenticator\FormAuthenticator;
 use CakeDC\Users\Authenticator\SocialAuthenticator;
 use CakeDC\Users\Controller\Component\LoginComponent;
-use CakeDC\Users\Controller\Component\UsersAuthComponent;
 use CakeDC\Users\Middleware\SocialAuthMiddleware;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;

diff --git a/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php b/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php
@@ -12,7 +12,6 @@
 namespace CakeDC\Users\Test\TestCase\Controller\Traits;
 
 use CakeDC\Users\Controller\Component\OneTimePasswordAuthenticatorComponent;
-use CakeDC\Users\Controller\Component\UsersAuthComponent;
 use CakeDC\Users\Controller\Traits\OneTimePasswordVerifyTrait;
 use Cake\Core\Configure;
 use Cake\Http\ServerRequest;