refactor: move createIdentityEmailActivate() in Session to Actions/EmailActivator

Author: kenjis

src/Authentication/Actions/EmailActivator.php

@@ -9,6 +9,7 @@
 use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Exceptions\LogicException;
 use CodeIgniter\Shield\Exceptions\RuntimeException;
+use CodeIgniter\Shield\Models\UserIdentityModel;
 
 class EmailActivator implements ActionInterface
 {
@@ -34,7 +35,7 @@ public function show(): string
             );
         }
 
-        $code = $authenticator->createIdentityEmailActivate();
+        $code = $this->createIdentity($user);
 
         // Send the email
         helper('email');
@@ -88,4 +89,40 @@ public function verify(IncomingRequest $request)
         // Get our login redirect url
         return redirect()->to(config('Auth')->loginRedirect());
     }
+
+    /**
+     * Called from `RegisterController::registerAction()`
+     */
+    public function afterRegister(User $user): void
+    {
+        $this->createIdentity($user);
+    }
+
+    /**
+     * Create an identity for Email Activation
+     *
+     * @return string The secret code
+     */
+    private function createIdentity(User $user): string
+    {
+        helper('text');
+
+        /** @var UserIdentityModel $userIdentityModel */
+        $userIdentityModel = model(UserIdentityModel::class);
+
+        $userIdentityModel->deleteIdentitiesByType($user->getAuthId(), 'email_activate');
+
+        //  Create an identity for our activation hash
+        $code = random_string('nozero', 6);
+
+        $userIdentityModel->insert([
+            'user_id' => $user->getAuthId(),
+            'type'    => 'email_activate',
+            'secret'  => $code,
+            'name'    => 'register',
+            'extra'   => lang('Auth.needVerification'),
+        ]);
+
+        return $code;
+    }
 }

src/Authentication/Authenticators/Session.php

@@ -653,29 +653,4 @@ private function refreshRememberMeToken(stdClass $token)
 
         $this->setRememberMeCookie($rawToken);
     }
-
-    /**
-     * Create an identity for Email Activation
-     *
-     * @return string The secret code
-     */
-    public function createIdentityEmailActivate(): string
-    {
-        helper('text');
-
-        $this->userIdentityModel->deleteIdentitiesByType($this->user->getAuthId(), 'email_activate');
-
-        //  Create an identity for our activation hash
-        $code = random_string('nozero', 6);
-
-        $this->userIdentityModel->insert([
-            'user_id' => $this->user->getAuthId(),
-            'type'    => 'email_activate',
-            'secret'  => $code,
-            'name'    => 'register',
-            'extra'   => lang('Auth.needVerification'),
-        ]);
-
-        return $code;
-    }
 }

src/Controllers/RegisterController.php

@@ -3,6 +3,7 @@
 namespace CodeIgniter\Shield\Controllers;
 
 use App\Controllers\BaseController;
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
@@ -90,9 +91,13 @@ public function registerAction(): RedirectResponse
         $actionClass = setting('Auth.actions')['register'] ?? null;
 
         if (! empty($actionClass)) {
-            session()->set('auth_action', $actionClass);
+            $action = Factories::actions($actionClass); // @phpstan-ignore-line
+
+            if (method_exists($action, 'afterRegister')) {
+                $action->afterRegister($user);
+            }
 
-            $authenticator->createIdentityEmailActivate();
+            session()->set('auth_action', $actionClass);
 
             return redirect()->to('auth/a/show');
         }