Merge 5d42441 into 22b829f

thecodingmachine · Jul 15, 2019 · 1eec2cb · 1eec2cb
2 parents 22b829f + 5d42441
commit 1eec2cb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/DependencyInjection/GraphqliteCompilerPass.php b/DependencyInjection/GraphqliteCompilerPass.php
@@ -86,6 +86,9 @@ public function process(ContainerBuilder $container)
         $controllersNamespaces = $container->getParameter('graphqlite.namespace.controllers');
         $typesNamespaces = $container->getParameter('graphqlite.namespace.types');
 
+        $firewallName = $container->getParameter('graphqlite.security.firewall_name');
+        $firewallConfigServiceName = 'security.firewall.map.config.'.$firewallName;
+
         // 2 seconds of TTL in environment mode. Otherwise, let's cache forever!
 
         $schemaFactory = $container->getDefinition(SchemaFactory::class);
@@ -99,7 +102,7 @@ public function process(ContainerBuilder $container)
 
         $disableLogin = false;
         if ($container->getParameter('graphqlite.security.enable_login') === 'auto'
-         && (!$container->has(UserProviderInterface::class) ||
+         && (!$container->has($firewallConfigServiceName) ||
                 !$container->has(UserPasswordEncoderInterface::class) ||
                 !$container->has(TokenStorageInterface::class) ||
                 !$container->has(SessionInterface::class)
@@ -119,11 +122,18 @@ public function process(ContainerBuilder $container)
             if (!$container->has(SessionInterface::class)) {
                 throw new GraphQLException('In order to enable the login/logout mutations (via the graphqlite.security.enable_login parameter), you need to enable session support (via the "framework.session.enabled" config parameter).');
             }
-            if (!$container->has(UserPasswordEncoderInterface::class) || !$container->has(TokenStorageInterface::class) || !$container->has(UserProviderInterface::class)) {
+            if (!$container->has(UserPasswordEncoderInterface::class) || !$container->has(TokenStorageInterface::class) || !$container->has($firewallConfigServiceName)) {
                 throw new GraphQLException('In order to enable the login/logout mutations (via the graphqlite.security.enable_login parameter), you need to install the security bundle. Please be sure to correctly configure the user provider (in the security.providers configuration settings)');
             }
         }
 
+        if ($disableLogin === false) {
+            // Let's do some dark magic. We need the user provider. We need its name. It is stored in the "config" object.
+            $provider = $container->findDefinition('security.firewall.map.config.'.$firewallName)->getArgument(5);
+
+            $container->findDefinition(LoginController::class)->setArgument(0, new Reference($provider));
+        }
+
 
         foreach ($container->getDefinitions() as $id => $definition) {
             if ($definition->isAbstract() || $definition->getClass() === null) {

diff --git a/Tests/GraphqliteTestingKernel.php b/Tests/GraphqliteTestingKernel.php
@@ -79,10 +79,21 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
                                ],
                             ],
                         ],
+                        'in_memory_other' => [
+                            'memory' => [
+                                'users' => [
+                                    'foo' => [
+                                        'password' => 'bar',
+                                        'roles' => 'ROLE_USER',
+                                    ],
+                                ],
+                            ],
+                        ],
                     ],
                     'firewalls' => [
                         'main' => [
-                            'anonymous' => true
+                            'anonymous' => true,
+                            'provider' => 'in_memory'
                         ]
                     ],
                     'encoders' => [