refactor: migrate to scoped execution contexts

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

lib/Controllers/EnrollmentController.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace KTXM\AuthenticationProviderTotp\Controllers;
 
 use KTXC\Http\Response\JsonResponse;
-use KTXC\SessionIdentity;
+use KTXC\Context\IdentityContextInterface;
 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 SessionIdentity $userIdentity,
+        private readonly IdentityContextInterface $identityContext,
         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->userIdentity->identifier();
+        $userId = $this->identityContext->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->userIdentity->identifier();
+        $userId = $this->identityContext->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->userIdentity->identifier();
+        $userId = $this->identityContext->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->userIdentity->identifier();
+        $userId = $this->identityContext->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\SessionTenant;
+use KTXC\Context\TenantContextInterface;
 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 SessionTenant $tenant,
+        private readonly TenantContextInterface $tenantContext,
         private readonly EnrollmentStore $enrollmentStore,
     ) {}
 
@@ -35,7 +35,7 @@ class EnrollmentService
      */
     public function isEnrolled(string $userId): bool
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return false;
         }
@@ -53,7 +53,7 @@ class EnrollmentService
      */
     public function beginEnrollment(string $userId, array $config = []): array
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -108,7 +108,7 @@ class EnrollmentService
      */
     public function completeEnrollment(string $userId, string $code): array
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -150,7 +150,7 @@ class EnrollmentService
      */
     public function removeEnrollment(string $userId): array
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -181,7 +181,7 @@ class EnrollmentService
      */
     public function verifyCode(string $userId, string $code): array
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return [
                 'success' => false,
@@ -225,7 +225,7 @@ class EnrollmentService
      */
     public function getEnrollmentSecret(string $userId): ?string
     {
-        $tenantId = $this->tenant->identifier();
+        $tenantId = $this->tenantContext->identifier();
         if (!$tenantId) {
             return null;
         }

package-lock.json

@@ -612,9 +612,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -631,9 +628,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -650,9 +644,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -669,9 +660,6 @@
       "cpu": [
         "s390x"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -686,9 +674,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -703,9 +688,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1921,9 +1903,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1944,9 +1923,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1965,9 +1941,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1986,9 +1959,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -3083,7 +3053,9 @@
       }
     },
     "node_modules/vuetify": {
-      "version": "4.1.5",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-4.1.6.tgz",
+      "integrity": "sha512-VOsRTsNfs+FE4JXMONZkqX2yznSqC/FXG9/pgVVjsoqIjUvJg+CfFTuOlgyWVFrZYY+crk7LV9uaiN8bZREV/g==",
       "license": "MIT",
       "funding": {
         "type": "github",