Make user service registration optional (#13)

FastyBird · Jul 21, 2024 · 722f011 · 722f011
1 parent b59217f
commit 722f011
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/DI/SimpleAuthExtension.php b/src/DI/SimpleAuthExtension.php
@@ -151,9 +151,6 @@ public function loadConfiguration(): void
 		$builder->addDefinition($this->prefix('security.annotationChecker'), new DI\Definitions\ServiceDefinition())
 			->setType(Security\AnnotationChecker::class);
 
-		$builder->addDefinition($this->prefix('security.user'), new DI\Definitions\ServiceDefinition())
-			->setType(Security\User::class);
-
 		/**
 		 * Casbin
 		 */
@@ -261,6 +258,23 @@ public function beforeCompile(): void
 		$configuration = $this->getConfig();
 		assert($configuration instanceof stdClass);
 
+		/**
+		 * Security
+		 */
+
+		$userContextServiceName = $builder->getByType(Security\User::class);
+
+		$userContext = null;
+
+		if ($userContextServiceName !== null) {
+			$userContext = $builder->getDefinition($userContextServiceName);
+		}
+
+		if ($userContext === null) {
+			$builder->addDefinition($this->prefix('security.user'), new DI\Definitions\ServiceDefinition())
+				->setType(Security\User::class);
+		}
+
 		/**
 		 * Doctrine extension
 		 */