Update mongo Docker tag to v8

.github/workflows/php-integration-tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mongo:
-        image: mongo:7
+        image: mongo:8
         options: >-
           --health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
           --health-interval 5s

composer.lock

@@ -9,20 +9,20 @@
     "packages-dev": [
         {
             "name": "myclabs/deep-copy",
-            "version": "1.14.0",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
-                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
@@ -57,15 +57,15 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
-                    "url": "https://github.com/mnapoli",
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "github"
+                    "type": "tidelift"
                 }
             ],
-            "time": "2026-08-11T10:17:44+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -332,23 +332,23 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "6.0.2",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5"
+                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
-                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.5.33"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
@@ -381,7 +381,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
             },
             "funding": [
                 {
@@ -401,7 +401,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-25T14:40:53+00:00"
+            "time": "2026-02-02T14:04:18+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -589,16 +589,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.5.34",
+            "version": "12.5.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f"
+                "reference": "0608d157a284f15cc73b99a3327eff06b66a176d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d",
-                "reference": "6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f",
+                "reference": "0608d157a284f15cc73b99a3327eff06b66a176d",
                 "shasum": ""
             },
             "require": {
@@ -608,18 +608,18 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.14.0",
+                "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
                 "phpunit/php-code-coverage": "^12.5.7",
-                "phpunit/php-file-iterator": "^6.0.2",
+                "phpunit/php-file-iterator": "^6.0.1",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
                 "phpunit/php-timer": "^8.0.0",
                 "sebastian/cli-parser": "^4.2.1",
                 "sebastian/comparator": "^7.1.8",
-                "sebastian/diff": "^7.0.1",
+                "sebastian/diff": "^7.0.0",
                 "sebastian/environment": "^8.1.2",
                 "sebastian/exporter": "^7.0.3",
                 "sebastian/global-state": "^8.0.3",
@@ -667,7 +667,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.34"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31"
             },
             "funding": [
                 {
@@ -675,7 +675,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2026-08-27T08:38:28+00:00"
+            "time": "2026-07-06T14:54:16+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -898,24 +898,24 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "7.0.1",
+            "version": "7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6"
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
-                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.5.33",
+                "phpunit/phpunit": "^12.0",
-                "symfony/process": "^7.4.17"
+                "symfony/process": "^7.2"
             },
             "type": "library",
             "extra": {
@@ -953,27 +953,15 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2026-08-25T15:35:54+00:00"
+            "time": "2025-02-07T04:55:46+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1710,5 +1698,5 @@
         "php": ">=8.3"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }

lib/Controllers/EnrollmentController.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace KTXM\AuthenticationProviderTotp\Controllers;
 
 use KTXC\Http\Response\JsonResponse;
-use KTXC\Context\IdentityContextInterface;
+use KTXC\SessionIdentity;
 use KTXF\Controller\ControllerAbstract;
 use KTXF\Routing\Attributes\AuthenticatedRoute;
 use KTXM\AuthenticationProviderTotp\Services\EnrollmentService;
@@ -23,7 +23,7 @@ use KTXM\AuthenticationProviderTotp\Services\EnrollmentService;
 class EnrollmentController extends ControllerAbstract
 {
     public function __construct(
-        private readonly IdentityContextInterface $identityContext,
+        private readonly SessionIdentity $userIdentity,
         private readonly EnrollmentService $enrollmentService,
     ) {}
 
@@ -33,7 +33,7 @@ class EnrollmentController extends ControllerAbstract
     #[AuthenticatedRoute('/totp/status', name: 'totp.status', methods: ['GET'])]
     public function status(): JsonResponse
     {
-        $userId = $this->identityContext->identifier();
+        $userId = $this->userIdentity->identifier();
         if (!$userId) {
             return new JsonResponse(
                 ['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
@@ -56,7 +56,7 @@ class EnrollmentController extends ControllerAbstract
     #[AuthenticatedRoute('/totp/enroll', name: 'totp.enroll.begin', methods: ['POST'])]
     public function beginEnrollment(string $accountName = ''): JsonResponse
     {
-        $userId = $this->identityContext->identifier();
+        $userId = $this->userIdentity->identifier();
         if (!$userId) {
             return new JsonResponse(
                 ['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
@@ -95,7 +95,7 @@ class EnrollmentController extends ControllerAbstract
     #[AuthenticatedRoute('/totp/enroll/verify', name: 'totp.enroll.verify', methods: ['POST'])]
     public function completeEnrollment(string $code): JsonResponse
     {
-        $userId = $this->identityContext->identifier();
+        $userId = $this->userIdentity->identifier();
         if (!$userId) {
             return new JsonResponse(
                 ['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
@@ -131,7 +131,7 @@ class EnrollmentController extends ControllerAbstract
     #[AuthenticatedRoute('/totp/enroll/remove', name: 'totp.enroll.remove', methods: ['POST'])]
     public function removeEnrollment(string $code): JsonResponse
     {
-        $userId = $this->identityContext->identifier();
+        $userId = $this->userIdentity->identifier();
         if (!$userId) {
             return new JsonResponse(
                 ['error' => 'User not authenticated', 'error_code' => 'unauthorized'],

lib/Services/EnrollmentService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace KTXM\AuthenticationProviderTotp\Services;
 
-use KTXC\Context\TenantContextInterface;
+use KTXC\SessionTenant;
 use KTXM\AuthenticationProviderTotp\Stores\EnrollmentStore;
 
 /**
@@ -26,7 +26,7 @@ class EnrollmentService
     private const SECRET_LENGTH = 20; // 160 bits as recommended by RFC 4226
 
     public function __construct(
-        private readonly TenantContextInterface $tenantContext,
+        private readonly SessionTenant $tenant,
         private readonly EnrollmentStore $enrollmentStore,
     ) {}
 
@@ -35,7 +35,7 @@ class EnrollmentService
      */
     public function isEnrolled(string $userId): bool
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return false;
         }
@@ -53,7 +53,7 @@ class EnrollmentService
      */
     public function beginEnrollment(string $userId, array $config = []): array
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -108,7 +108,7 @@ class EnrollmentService
      */
     public function completeEnrollment(string $userId, string $code): array
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -150,7 +150,7 @@ class EnrollmentService
      */
     public function removeEnrollment(string $userId): array
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -181,7 +181,7 @@ class EnrollmentService
      */
     public function verifyCode(string $userId, string $code): array
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -225,7 +225,7 @@ class EnrollmentService
      */
     public function getEnrollmentSecret(string $userId): ?string
     {
-        $tenantId = $this->tenantContext->identifier();
+        $tenantId = $this->tenant->identifier();
         if (!$tenantId) {
             return null;
         }