Merge branch 'develop' into quick-start-docs

Author: lonnieezell

docs/customization.md

@@ -86,3 +86,32 @@ class LoginController extends ShieldLogin
     }
 }
 ```
+
+## Custom validation rules
+
+### Registration
+
+Shield has the following rules for registration:
+
+```php
+[
+    'username'         => 'required|alpha_numeric_space|min_length[3]|is_unique[users.username]',
+    'email'            => 'required|valid_email|is_unique[auth_identities.secret]',
+    'password'         => 'required|strong_password',
+    'password_confirm' => 'required|matches[password]',
+];
+```
+
+If you need a different set of rules for registration, you can specify them in your `Validation` configuration (**app\Config\Validation.php**) like:
+
+```php
+//--------------------------------------------------------------------
+// Rules
+//--------------------------------------------------------------------
+public $registration = [
+    'username'         => 'required|alpha_numeric_space|min_length[3]|is_unique[users.username]',
+    'email'            => 'required|valid_email|is_unique[auth_identities.secret]',
+    'password'         => 'required|strong_password',
+    'password_confirm' => 'required|matches[password]',
+];
+```

src/Authentication/Authenticators/AccessTokens.php

@@ -124,7 +124,7 @@ public function check(array $credentials): Result
             ]);
         }
 
-        $token->last_used_at = Time::now()->toDateTimeString();
+        $token->last_used_at = Time::now()->format('Y-m-d H:i:s');
         $identityModel->save($token);
 
         // Ensure the token is set as the current token

src/Authentication/Authenticators/Session.php

@@ -836,10 +836,9 @@ protected function rememberUser(User $user): void
 
     private function calcExpires(): string
     {
-        return date(
-            'Y-m-d H:i:s',
-            time() + setting('Auth.sessionConfig')['rememberLength']
-        );
+        $timestamp = Time::now()->getTimestamp() + setting('Auth.sessionConfig')['rememberLength'];
+
+        return Time::createFromTimestamp($timestamp)->format('Y-m-d H:i:s');
     }
 
     private function setRememberMeCookie(string $rawToken): void

src/Authorization/Traits/Authorizable.php

@@ -367,7 +367,7 @@ private function saveGroupsOrPermissions(string $type, $model, array $cache): vo
                 $inserts[] = [
                     'user_id'    => $this->id,
                     $type        => $item,
-                    'created_at' => Time::now()->toDateTimeString(),
+                    'created_at' => Time::now()->format('Y-m-d H:i:s'),
                 ];
             }
 

src/Controllers/LoginController.php

@@ -3,9 +3,7 @@
 namespace CodeIgniter\Shield\Controllers;
 
 use App\Controllers\BaseController;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\Response;
 
 class LoginController extends BaseController
 {
@@ -27,18 +25,21 @@ public function loginView()
 
     /**
      * Attempts to log the user in.
-     *
-     * @return Response|string
      */
-    public function loginAction()
+    public function loginAction(): RedirectResponse
     {
-        /** @var IncomingRequest $request */
-        $request = service('request');
+        // Validate here first, since some things,
+        // like the password, can only be validated properly here.
+        $rules = $this->getValidationRules();
+
+        if (! $this->validate($rules)) {
+            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
+        }
 
-        $credentials             = $request->getPost(setting('Auth.validFields'));
+        $credentials             = $this->request->getPost(setting('Auth.validFields'));
         $credentials             = array_filter($credentials);
-        $credentials['password'] = $request->getPost('password');
-        $remember                = (bool) $request->getPost('remember');
+        $credentials['password'] = $this->request->getPost('password');
+        $remember                = (bool) $this->request->getPost('remember');
 
         // Attempt to login
         $result = auth('session')->remember($remember)->attempt($credentials);
@@ -56,11 +57,23 @@ public function loginAction()
     }
 
     /**
-     * Logs the current user out.
+     * Returns the rules that should be used for validation.
      *
-     * @return Response|string
+     * @return string[]
+     */
+    protected function getValidationRules(): array
+    {
+        return setting('Validation.login') ?? [
+            //'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]',
+            'email'    => 'required|max_length[254]|valid_email',
+            'password' => 'required',
+        ];
+    }
+
+    /**
+     * Logs the current user out.
      */
-    public function logoutAction()
+    public function logoutAction(): RedirectResponse
     {
         auth()->logout();
 

src/Controllers/MagicLinkController.php

@@ -85,7 +85,7 @@ public function loginAction()
             'user_id' => $user->id,
             'type'    => Session::ID_TYPE_MAGIC_LINK,
             'secret'  => $token,
-            'expires' => Time::now()->addSeconds(setting('Auth.magicLinkLifetime'))->toDateTimeString(),
+            'expires' => Time::now()->addSeconds(setting('Auth.magicLinkLifetime'))->format('Y-m-d H:i:s'),
         ]);
 
         // Send the user an email with the code

src/Controllers/RegisterController.php

@@ -8,7 +8,6 @@
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
 use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Models\UserModel;
-use CodeIgniter\Validation\Validation;
 
 /**
  * Class RegisterController
@@ -53,11 +52,8 @@ public function registerAction(): RedirectResponse
         // like the password, can only be validated properly here.
         $rules = $this->getValidationRules();
 
-        /** @var Validation $validation */
-        $validation = service('validation');
-
         if (! $this->validate($rules)) {
-            return redirect()->back()->withInput()->with('errors', $validation->getErrors());
+            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
         }
 
         // Save the user
@@ -134,7 +130,7 @@ protected function getUserEntity(): User
      */
     protected function getValidationRules(): array
     {
-        return [
+        return setting('Validation.registration') ?? [
             'username'         => 'required|alpha_numeric_space|min_length[3]|is_unique[users.username]',
             'email'            => 'required|valid_email|is_unique[auth_identities.secret]',
             'password'         => 'required|strong_password',

src/Models/LoginModel.php

@@ -61,7 +61,7 @@ public function recordLoginAttempt(
             'id_type'    => $idType,
             'identifier' => $identifier,
             'user_id'    => $userId,
-            'date'       => date('Y-m-d H:i:s'),
+            'date'       => Time::now()->format('Y-m-d H:i:s'),
             'success'    => (int) $success,
         ]);
 
@@ -91,7 +91,7 @@ public function fake(Generator &$faker): Login
             'id_type'    => Session::ID_TYPE_EMAIL_PASSWORD,
             'identifier' => $faker->email,
             'user_id'    => null,
-            'date'       => Time::parse('-1 day')->toDateTimeString(),
+            'date'       => Time::parse('-1 day')->format('Y-m-d H:i:s'),
             'success'    => true,
         ]);
     }

src/Models/TokenLoginModel.php

@@ -22,7 +22,7 @@ public function fake(Generator &$faker): Login
             'ip_address' => $faker->ipv4,
             'identifier' => 'token: ' . random_string('crypto', 64),
             'user_id'    => fake(UserModel::class)->id,
-            'date'       => Time::parse('-1 day')->toDateTimeString(),
+            'date'       => Time::parse('-1 day')->format('Y-m-d H:i:s'),
             'success'    => true,
         ]);
     }

src/Models/UserIdentityModel.php

@@ -2,6 +2,7 @@
 
 namespace CodeIgniter\Shield\Models;
 
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Authenticators\AccessTokens;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
@@ -247,7 +248,7 @@ public function getIdentitiesByTypes(User $user, array $types): array
      */
     public function touchIdentity(UserIdentity $identity): void
     {
-        $identity->last_used_at = date('Y-m-d H:i:s');
+        $identity->last_used_at = Time::now()->format('Y-m-d H:i:s');
 
         $return = $this->save($identity);