dotkernel · SergiuBota1 · Apr 29, 2026 · Apr 30, 2026 · Apr 30, 2026 · Apr 30, 2026
diff --git a/bin/composer-post-install-script.php b/bin/composer-post-install-script.php
@@ -54,7 +54,12 @@ function getEnvironment(): string
     ],
     [
         'source'      => 'vendor/dotkernel/dot-mail/config/mail.global.php.dist',
-        'destination' => 'config/autoload/mail.global.php',
+        'destination' => 'config/autoload/mail.local.php',
+        'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
+    ],
+    [
+        'source'      => 'vendor/dotkernel/dot-mail/config/mail.global.php.dist',
+        'destination' => 'config/autoload/mail.local.php.dist',
         'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
     ],
 ];

diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
         "laminas/laminas-component-installer": "^3.7.0",
         "laminas/laminas-config-aggregator": "^1.19.0",
         "mezzio/mezzio": "^3.26.0",
-        "mezzio/mezzio-authentication-oauth2": "^2.13.0",
+        "mezzio/mezzio-authentication-oauth2": "^3.0.1",
         "mezzio/mezzio-authorization-rbac": "^1.10.0",
         "mezzio/mezzio-cors": "^1.15.0",
         "mezzio/mezzio-fastroute": "^3.14.0",

diff --git a/src/Admin/src/Service/AdminLoginService.php b/src/Admin/src/Service/AdminLoginService.php
@@ -57,7 +57,11 @@ public function getAdminLogins(array $params): array
             'login.osVersion',
             'login.clientType',
             'login.clientName',
-            'login.isCrawler',
+            'login.deviceBrand',
+            'login.deviceModel',
+            'login.osPlatform',
+            'login.clientEngine',
+            'login.clientVersion',
             'login.loginStatus',
             'login.identity',
             'login.created',
@@ -75,7 +79,7 @@ public function getAdminLogins(array $params): array
     }
 
     /**
-     * @param non-empty-array<non-empty-string, mixed> $serverParams
+     * @param array{HTTP_X_FORWARDED_FOR?: string, HTTP_CLIENT_IP?: string, REMOTE_ADDR: string} $serverParams
      * @throws Exception
      */
     public function logFailedLogin(array $serverParams, string $name): AdminLogin
@@ -84,7 +88,7 @@ public function logFailedLogin(array $serverParams, string $name): AdminLogin
     }
 
     /**
-     * @param non-empty-array<non-empty-string, mixed> $serverParams
+     * @param array{HTTP_X_FORWARDED_FOR?: string, HTTP_CLIENT_IP?: string, REMOTE_ADDR: string} $serverParams
      * @throws Exception
      */
     public function logSuccessfulLogin(array $serverParams, string $name): AdminLogin
@@ -93,7 +97,7 @@ public function logSuccessfulLogin(array $serverParams, string $name): AdminLogi
     }
 
     /**
-     * @param non-empty-array<non-empty-string, mixed> $serverParams
+     * @param array{HTTP_X_FORWARDED_FOR?: string, HTTP_CLIENT_IP?: string, REMOTE_ADDR: string} $serverParams
      * @throws Exception
      */
     private function logAdminVisit(array $serverParams, string $name, SuccessFailureEnum $status): AdminLogin
@@ -111,7 +115,8 @@ private function logAdminVisit(array $serverParams, string $name, SuccessFailure
          */
         $browser = new stdClass();
         if (ini_get('browscap')) {
-            $browser = get_browser($_SERVER['HTTP_USER_AGENT']);
+            $result  = get_browser($_SERVER['HTTP_USER_AGENT']);
+            $browser = $result instanceof stdClass ? $result : $browser;
         }
 
         $adminLogin = (new AdminLogin())
@@ -128,7 +133,11 @@ private function logAdminVisit(array $serverParams, string $name, SuccessFailure
             ->setClientType(! empty($browser->browser_type) ? $browser->browser_type : null)
             ->setClientName(! empty($browser->browser) ? $browser->browser : null)
             ->setLoginStatus($status)
-            ->setIsCrawler(! empty($browser->crawler) ? YesNoEnum::Yes : YesNoEnum::No)
+            ->setDeviceBrand(! empty($browser->device_brand) ? $browser->device_brand : null)
+            ->setDeviceBrand(! empty($browser->device_model) ? $browser->device_model : null)
+            ->setDeviceBrand(! empty($browser->platform_version) ? $browser->platform_version : null)
+            ->setDeviceBrand(! empty($browser->browser_engine) ? $browser->browser_engine : null)
+            ->setDeviceBrand(! empty($browser->browser_version) ? $browser->browser_version : null)
             ->setIdentity($name);
 
         $this->adminLoginRepository->saveResource($adminLogin);

diff --git a/src/Admin/templates/admin/list-admin-login.html.twig b/src/Admin/templates/admin/list-admin-login.html.twig
@@ -91,8 +91,20 @@
                                 <th class="column-login-clientName">
                                     {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.clientName', 'Client Name') }}
                                 </th>
-                                <th class="column-login-isCrawler">
-                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.isCrawler', 'Is Crawler') }}
+                                <th class="column-login-deviceBrand">
+                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.deviceBrand', 'Device Brand') }}
+                                </th>
+                                <th class="column-login-deviceModel">
+                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.deviceModel', 'Device Model') }}
+                                </th>
+                                <th class="column-login-osPlatform">
+                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.osPlatform', 'Os Platform') }}
+                                </th>
+                                <th class="column-login-clientEngine">
+                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.clientEngine', 'Client Engine') }}
+                                </th>
+                                <th class="column-login-clientVersion">
+                                    {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.clientVersion', 'Client Version') }}
                                 </th>
                                 <th class="column-login-created">
                                     {{ sortableColumn('admin::list-admin-login', {}, pagination.queryParams, 'login.created', 'Created') }}
@@ -126,13 +138,11 @@
                                 <td class="column-login-osVersion">{{ login.osVersion }}</td>
                                 <td class="column-login-clientType">{{ login.clientType }}</td>
                                 <td class="column-login-clientName">{{ login.clientName }}</td>
-                                <td class="column-login-isCrawler">
-                                    {% if login.isCrawler.value == 'yes' %}
-                                        <span class="badge text-bg-primary">Yes</span>
-                                    {% else %}
-                                        <span class="badge text-bg-secondary">No</span>
-                                    {% endif %}
-                                </td>
+                                <td class="column-login-deviceBrand">{{ login.deviceBrand }}</td>
+                                <td class="column-login-deviceModel">{{ login.deviceModel }}</td>
+                                <td class="column-login-osPlatform">{{ login.osPlatform }}</td>
+                                <td class="column-login-clientEngine">{{ login.clientEngine }}</td>
+                                <td class="column-login-clientVersion">{{ login.clientVersion }}</td>
                                 <td class="column-login-created">{{ login.getCreated()|date('Y-m-d H:i:s') }}</td>
                             </tr>
                             {% endfor %}

diff --git a/src/Core/src/Admin/src/Entity/Admin.php b/src/Core/src/Admin/src/Entity/Admin.php
@@ -32,9 +32,9 @@ class Admin extends AbstractEntity implements UserEntityInterface
     use TimestampsTrait;
     use UuidIdentifierTrait;
 
-    /** @var non-empty-string|null $identity */
+    /** @var non-empty-string $identity */
     #[ORM\Column(name: 'identity', type: 'string', length: 191, unique: true)]
-    protected ?string $identity = null;
+    protected string $identity;
 
     #[ORM\Column(name: 'firstName', type: 'string', length: 191, nullable: true)]
     protected ?string $firstName = null;
@@ -43,7 +43,7 @@ class Admin extends AbstractEntity implements UserEntityInterface
     protected ?string $lastName = null;
 
     #[ORM\Column(name: 'password', type: 'string', length: 191)]
-    protected ?string $password = null;
+    protected string $password;
 
     #[ORM\Column(
         type: 'admin_status_enum',
@@ -71,16 +71,11 @@ public function __construct()
         $this->settings = new ArrayCollection();
     }
 
-    public function getIdentity(): ?string
+    public function getIdentity(): string
     {
         return $this->identity;
     }
 
-    public function hasIdentity(): bool
-    {
-        return $this->identity !== null;
-    }
-
     /**
      * @param non-empty-string $identity
      */
@@ -91,6 +86,11 @@ public function setIdentity(string $identity): self
         return $this;
     }
 
+    public function hasIdentity(): bool
+    {
+        return ! empty($this->identity);
+    }
+
     public function getFirstName(): ?string
     {
         return $this->firstName;
@@ -115,7 +115,7 @@ public function setLastName(string $lastName): self
         return $this;
     }
 
-    public function getPassword(): ?string
+    public function getPassword(): string
     {
         return $this->password;
     }
@@ -213,9 +213,12 @@ public function isActive(): bool
         return $this->status === AdminStatusEnum::Active;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function getIdentifier(): string
     {
-        return (string) $this->identity;
+        return $this->identity;
     }
 
     /**

diff --git a/src/Core/src/Admin/src/Entity/AdminLogin.php b/src/Core/src/Admin/src/Entity/AdminLogin.php
@@ -39,6 +39,12 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'deviceType', type: 'string', length: 191, nullable: true)]
     protected ?string $deviceType = null;
 
+    #[ORM\Column(name: 'deviceBrand', type: 'string', length: 191, nullable: true)]
+    protected ?string $deviceBrand = null;
+
+    #[ORM\Column(name: 'deviceModel', type: 'string', length: 40, nullable: true)]
+    protected ?string $deviceModel = null;
+
     #[ORM\Column(type: 'yes_no_enum', nullable: true, enumType: YesNoEnum::class)]
     protected YesNoEnum $isMobile = YesNoEnum::No;
 
@@ -48,14 +54,20 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'osVersion', type: 'string', length: 191, nullable: true)]
     protected ?string $osVersion = null;
 
+    #[ORM\Column(name: 'osPlatform', type: 'string', length: 191, nullable: true)]
+    protected ?string $osPlatform = null;
+
     #[ORM\Column(name: 'clientType', type: 'string', length: 191, nullable: true)]
     protected ?string $clientType = null;
 
     #[ORM\Column(name: 'clientName', type: 'string', length: 191, nullable: true)]
     protected ?string $clientName = null;
 
-    #[ORM\Column(type: 'yes_no_enum', nullable: true, enumType: YesNoEnum::class)]
-    protected YesNoEnum $isCrawler = YesNoEnum::No;
+    #[ORM\Column(name: 'clientEngine', type: 'string', length: 191, nullable: true)]
+    protected ?string $clientEngine = null;
+
+    #[ORM\Column(name: 'clientVersion', type: 'string', length: 191, nullable: true)]
+    protected ?string $clientVersion = null;
 
     #[ORM\Column(type: 'success_failure_enum', nullable: true, enumType: SuccessFailureEnum::class)]
     protected SuccessFailureEnum $loginStatus = SuccessFailureEnum::Fail;
@@ -132,6 +144,30 @@ public function setDeviceType(?string $deviceType): self
         return $this;
     }
 
+    public function getDeviceBrand(): ?string
+    {
+        return $this->deviceBrand;
+    }
+
+    public function setDeviceBrand(?string $deviceBrand): self
+    {
+        $this->deviceBrand = $deviceBrand;
+
+        return $this;
+    }
+
+    public function getDeviceModel(): ?string
+    {
+        return $this->deviceModel;
+    }
+
+    public function setDeviceModel(?string $deviceModel): self
+    {
+        $this->deviceModel = $deviceModel;
+
+        return $this;
+    }
+
     public function getIsMobile(): ?YesNoEnum
     {
         return $this->isMobile;
@@ -168,6 +204,18 @@ public function setOsVersion(?string $osVersion): self
         return $this;
     }
 
+    public function getOsPlatform(): ?string
+    {
+        return $this->osPlatform;
+    }
+
+    public function setOsPlatform(?string $osPlatform): self
+    {
+        $this->osPlatform = $osPlatform;
+
+        return $this;
+    }
+
     public function getClientType(): ?string
     {
         return $this->clientType;
@@ -192,14 +240,26 @@ public function setClientName(?string $clientName): self
         return $this;
     }
 
-    public function getIsCrawler(): ?YesNoEnum
+    public function getClientEngine(): ?string
+    {
+        return $this->clientEngine;
+    }
+
+    public function setClientEngine(?string $clientEngine): self
+    {
+        $this->clientEngine = $clientEngine;
+
+        return $this;
+    }
+
+    public function getClientVersion(): ?string
     {
-        return $this->isCrawler;
+        return $this->clientVersion;
     }
 
-    public function setIsCrawler(YesNoEnum $isCrawler): self
+    public function setClientVersion(?string $clientVersion): self
     {
-        $this->isCrawler = $isCrawler;
+        $this->clientVersion = $clientVersion;
 
         return $this;
     }
@@ -225,12 +285,16 @@ public function setLoginStatus(SuccessFailureEnum $loginStatus): self
      *     continent: string|null,
      *     organization: string|null,
      *     deviceType: string|null,
-     *     isMobile: 'no'|'yes',
+     *     deviceBrand: string|null,
+     *     deviceModel: string|null,
+     *     isMobile: string,
      *     osName: string|null,
      *     osVersion: string|null,
+     *     osPlatform: string|null,
      *     clientType: string|null,
      *     clientName: string|null,
-     *     isCrawler: 'no'|'yes',
+     *     clientEngine: string|null,
+     *     clientVersion: string|null,
      *     loginStatus: string,
      *     created: DateTimeImmutable|null,
      *     updated: DateTimeImmutable|null,
@@ -239,22 +303,26 @@ public function setLoginStatus(SuccessFailureEnum $loginStatus): self
     public function getArrayCopy(): array
     {
         return [
-            'id'           => $this->id->toString(),
-            'identity'     => $this->identity,
-            'adminIp'      => $this->adminIp,
-            'country'      => $this->country,
-            'continent'    => $this->continent,
-            'organization' => $this->organization,
-            'deviceType'   => $this->deviceType,
-            'isMobile'     => $this->isMobile->value,
-            'osName'       => $this->osName,
-            'osVersion'    => $this->osVersion,
-            'clientType'   => $this->clientType,
-            'clientName'   => $this->clientName,
-            'isCrawler'    => $this->isCrawler->value,
-            'loginStatus'  => $this->loginStatus->value,
-            'created'      => $this->created,
-            'updated'      => $this->updated,
+            'id'            => $this->id->toString(),
+            'identity'      => $this->identity,
+            'adminIp'       => $this->adminIp,
+            'country'       => $this->country,
+            'continent'     => $this->continent,
+            'organization'  => $this->organization,
+            'deviceType'    => $this->deviceType,
+            'deviceBrand'   => $this->deviceBrand,
+            'deviceModel'   => $this->deviceModel,
+            'isMobile'      => $this->isMobile->value,
+            'osName'        => $this->osName,
+            'osVersion'     => $this->osVersion,
+            'osPlatform'    => $this->osPlatform,
+            'clientType'    => $this->clientType,
+            'clientName'    => $this->clientName,
+            'clientEngine'  => $this->clientEngine,
+            'clientVersion' => $this->clientVersion,
+            'loginStatus'   => $this->loginStatus->value,
+            'created'       => $this->created,
+            'updated'       => $this->updated,
         ];
     }
 }
diff --git a/src/Core/src/App/src/Entity/NumericIdentifierTrait.php b/src/Core/src/App/src/Entity/NumericIdentifierTrait.php
@@ -11,9 +11,9 @@ trait NumericIdentifierTrait
     #[ORM\Id]
     #[ORM\Column(name: 'id', type: 'integer', options: ['unsigned' => true])]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
-    protected ?int $id;
+    protected int $id;
 
-    public function getId(): ?int
+    public function getId(): int
     {
         return $this->id;
     }