refactor(arch): enforce gateway compliance and remove service-wrapping gateways

lib/Service/Auth/AuthServicesFactory.php

@@ -42,7 +42,7 @@ class AuthServicesFactory
             $this->userServicesFactory->createUserReadRepository(),
             $this->authRepositoryFactory->createApiTokenRepository(),
             $this->authGatewayFactory->createAuthSettingsGateway(),
-            $this->createAuthScopeGateway(),
+            $this->authGatewayFactory->getTenantScopeService(),
             $this->databaseSessionRepository,
             $this->requestRuntime
         );
@@ -75,7 +75,7 @@ class AuthServicesFactory
             $this->userServicesFactory->createUserReadRepository(),
             $this->userServicesFactory->createUserWriteRepository(),
             $this->authRepositoryFactory->createRememberTokenRepository(),
-            $this->authGatewayFactory->createAuthPermissionGateway(),
+            $this->authGatewayFactory->createPermissionService(),
             $this->createAuthSessionTenantContextService(),
             $this->sessionStore,
             $this->cookieStore,
@@ -93,8 +93,8 @@ class AuthServicesFactory
             $this->userServicesFactory->createUserTenantContextService(),
             $this->createRememberMeService(),
             $this->createEmailVerificationService(),
-            $this->authGatewayFactory->createAuthPermissionGateway(),
-            $this->createAuthTenantSsoGateway(),
+            $this->authGatewayFactory->createPermissionService(),
+            $this->createTenantSsoService(),
             $this->createAuthSessionTenantContextService(),
             $this->auditServicesFactory->createSystemAuditService(),
             $this->sessionStore
@@ -109,8 +109,8 @@ class AuthServicesFactory
             $this->userServicesFactory->createUserAssignmentService(),
             $this->userServicesFactory->createUserTenantRepository(),
             $this->authGatewayFactory->createAuthSettingsGateway(),
-            $this->createAuthTenantSsoGateway(),
-            $this->authGatewayFactory->createAuthAvatarGateway(),
+            $this->createTenantSsoService(),
+            $this->userServicesFactory->createUserAvatarService(),
             $this->authGatewayFactory->createAuthExternalIdentityGateway()
         );
     }
@@ -140,16 +140,6 @@ class AuthServicesFactory
         );
     }
 
-    public function createAuthScopeGateway(): AuthScopeGateway
-    {
-        return $this->authGatewayFactory->createAuthScopeGateway();
-    }
-
-    private function createAuthTenantSsoGateway(): AuthTenantSsoGateway
-    {
-        return $this->authGatewayFactory->createAuthTenantSsoGateway($this->createTenantSsoService());
-    }
-
     private function createOidcHttpGateway(): OidcHttpGateway
     {
         return new OidcHttpGateway();
@@ -159,7 +149,7 @@ class AuthServicesFactory
     {
         return $this->authSessionTenantContextService ??= new AuthSessionTenantContextService(
             $this->userServicesFactory->createUserTenantContextService(),
-            $this->authGatewayFactory->createAuthSavedFilterGateway(),
+            $this->userServicesFactory->createUserSavedFilterService(),
             $this->sessionStore
         );
     }