Prefer canonical identity and organization directories

src/govoplan_access/backend/manifest.py

@@ -21,6 +21,7 @@ from govoplan_core.core.access import (
 )
 from govoplan_core.core.campaigns import CAPABILITY_CAMPAIGNS_ACCESS
 from govoplan_core.core.files import CAPABILITY_FILES_ACCESS
+from govoplan_core.core.identity import CAPABILITY_IDENTITY_DIRECTORY, IdentityDirectory
 from govoplan_core.core.idm import CAPABILITY_IDM_DIRECTORY, IdmDirectory
 from govoplan_core.core.organizations import CAPABILITY_ORGANIZATION_DIRECTORY, OrganizationDirectory
 from govoplan_core.core.module_guards import persistent_table_uninstall_guard
@@ -455,8 +456,11 @@ ACCESS_DOCUMENTATION: tuple[DocumentationTopic, ...] = (
 def _legacy_principal_resolver(context: ModuleContext) -> object:
     from govoplan_access.backend.auth.dependencies import LegacyPrincipalResolver
 
-    idm_directory = _optional_idm_directory(context)
-    return LegacyPrincipalResolver(idm_directory=idm_directory)
+    return LegacyPrincipalResolver(
+        idm_directory=_optional_idm_directory(context),
+        identity_directory=_optional_identity_directory(context),
+        organization_directory=_optional_organization_directory(context),
+    )
 
 
 def _legacy_permission_evaluator(context: ModuleContext) -> object:
@@ -483,13 +487,30 @@ def _tenant_context_switcher(context: ModuleContext) -> object:
 def _access_directory(context: ModuleContext) -> object:
     from govoplan_access.backend.directory import SqlAccessDirectory
 
-    return SqlAccessDirectory(idm_directory=_optional_idm_directory(context))
+    return SqlAccessDirectory(
+        idm_directory=_optional_idm_directory(context),
+        identity_directory=_optional_identity_directory(context),
+        organization_directory=_optional_organization_directory(context),
+    )
 
 
 def _access_semantic_directory(context: ModuleContext) -> object:
     from govoplan_access.backend.directory import SqlAccessDirectory
 
-    return SqlAccessDirectory(idm_directory=_optional_idm_directory(context))
+    return SqlAccessDirectory(
+        idm_directory=_optional_idm_directory(context),
+        identity_directory=_optional_identity_directory(context),
+        organization_directory=_optional_organization_directory(context),
+    )
+
+
+def _optional_identity_directory(context: ModuleContext) -> IdentityDirectory | None:
+    if not context.registry.has_capability(CAPABILITY_IDENTITY_DIRECTORY):
+        return None
+    capability = context.registry.require_capability(CAPABILITY_IDENTITY_DIRECTORY)
+    if not isinstance(capability, IdentityDirectory):
+        raise RuntimeError(f"Invalid capability: {CAPABILITY_IDENTITY_DIRECTORY}")
+    return capability
 
 
 def _optional_idm_directory(context: ModuleContext) -> IdmDirectory | None:
@@ -525,6 +546,7 @@ def _access_explanation_service(context: ModuleContext) -> object:
     from govoplan_access.backend.explanation import SqlAccessExplanationService
 
     return SqlAccessExplanationService(
+        identity_directory=_optional_identity_directory(context),
         idm_directory=_optional_idm_directory(context),
         organization_directory=_optional_organization_directory(context),
         resource_explanation_providers=_resource_explanation_providers(context),