fix firewall to answer all login entry points

Controller/AuthController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace FOS\FacebookBundle\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class AuthController extends Controller
+{
+
+  public function writeAuthInSessionAction( )
+  {
+    $accessToken = $this->getRequest( )->get( "accessToken" );
+    $this->get( "session" )->set( "fb.accessToken", $accessToken );
+    return new JsonResponse( array( "accessToken" => $accessToken ));
+  }
+}

DependencyInjection/Configuration.php

@@ -10,9 +10,7 @@
  */
 
 namespace FOS\FacebookBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder,
-    Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder, Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
  * This class contains the configuration information for the bundle
@@ -24,38 +22,28 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * Generates the configuration tree.
-     *
-     * @return TreeBuilder
-     */
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fos_facebook');
-
-        $rootNode
-            ->fixXmlConfig('permission', 'permissions')
-            ->children()
-                ->scalarNode('app_id')->isRequired()->cannotBeEmpty()->end()
-                ->scalarNode('secret')->isRequired()->cannotBeEmpty()->end()
-                ->scalarNode('file')->defaultNull()->end()
-                ->scalarNode('cookie')->defaultFalse()->end()
-                ->scalarNode('domain')->defaultNull()->end()
-                ->scalarNode('alias')->defaultNull()->end()
-                ->scalarNode('logging')->defaultValue('%kernel.debug%')->end()
-                ->scalarNode('culture')->defaultValue('en_US')->end()
-                ->arrayNode('class')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->scalarNode('api')->defaultValue('FOS\FacebookBundle\Facebook\FacebookSessionPersistence')->end()
-                        ->scalarNode('helper')->defaultValue('FOS\FacebookBundle\Templating\Helper\FacebookHelper')->end()
-                        ->scalarNode('twig')->defaultValue('FOS\FacebookBundle\Twig\Extension\FacebookExtension')->end()
-                    ->end()
-                ->end()
-                ->arrayNode('permissions')->prototype('scalar')->end()
-            ->end();
-
-        return $treeBuilder;
-    }
+  /**
+   * Generates the configuration tree.
+   *
+   * @return TreeBuilder
+   */
+
+  public function getConfigTreeBuilder( )
+  {
+    $treeBuilder = new TreeBuilder( );
+    $rootNode = $treeBuilder->root( 'fos_facebook' );
+
+    $rootNode->fixXmlConfig( 'permission', 'permissions' )->children( )->scalarNode( 'app_id' )->isRequired( )
+        ->cannotBeEmpty( )->end( )->scalarNode( 'secret' )->isRequired( )->cannotBeEmpty( )->end( )->scalarNode( 'file' )
+        ->defaultNull( )->end( )->scalarNode( 'cookie' )->defaultFalse( )->end( )->scalarNode( 'domain' )
+        ->defaultNull( )->end( )->scalarNode( 'alias' )->defaultNull( )->end( )->scalarNode( 'logging' )
+        ->defaultValue( '%kernel.debug%' )->end( )->scalarNode( 'culture' )->defaultValue( 'en_US' )->end( )
+        ->arrayNode( 'class' )->addDefaultsIfNotSet( )->children( )->scalarNode( 'api' )
+        ->defaultValue( 'FOS\FacebookBundle\Facebook\FacebookSessionPersistence' )->end( )->scalarNode( 'helper' )
+        ->defaultValue( 'FOS\FacebookBundle\Templating\Helper\FacebookHelper' )->end( )->scalarNode( 'twig' )
+        ->defaultValue( 'FOS\FacebookBundle\Twig\Extension\FacebookExtension' )->end( )->end( )->end( )
+        ->arrayNode( 'permissions' )->prototype( 'scalar' )->end( )->end( );
+
+    return $treeBuilder;
+  }
 }

DependencyInjection/FOSFacebookExtension.php

@@ -10,7 +10,6 @@
  */
 
 namespace FOS\FacebookBundle\DependencyInjection;
-
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -19,62 +18,67 @@
 
 class FOSFacebookExtension extends Extension
 {
-    protected $resources = array(
-        'facebook' => 'facebook.xml',
-        'security' => 'security.xml',
-    );
-
-    public function load(array $configs, ContainerBuilder $container)
+  protected $resources = array( 'facebook' => 'facebook.xml', 'security' => 'security.xml', );
+
+  public function load( array $configs, ContainerBuilder $container )
+  {
+    $processor = new Processor( );
+    $configuration = new Configuration( );
+    $config = $processor->processConfiguration( $configuration, $configs );
+
+    $this->loadDefaults( $container );
+
+    if ( isset( $config[ 'alias' ] ) )
     {
-        $processor = new Processor();
-        $configuration = new Configuration();
-        $config = $processor->processConfiguration($configuration, $configs);
-
-        $this->loadDefaults($container);
-
-        if (isset($config['alias'])) {
-            $container->setAlias($config['alias'], 'fos_facebook.api');
-        }
-
-        foreach (array('api', 'helper', 'twig') as $attribute) {
-            $container->setParameter('fos_facebook.'.$attribute.'.class', $config['class'][$attribute]);
-        }
-
-        foreach (array('app_id', 'secret', 'cookie', 'domain', 'logging', 'culture', 'permissions') as $attribute) {
-            $container->setParameter('fos_facebook.'.$attribute, $config[$attribute]);
-        }
-
-        if (isset($config['file']) && $container->hasDefinition('fos_facebook.api')) {
-            $facebookApi = $container->getDefinition('fos_facebook.api');
-            $facebookApi->setFile($config['file']);
-        }
+      $container->setAlias( $config[ 'alias' ], 'fos_facebook.api' );
     }
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function getXsdValidationBasePath()
+
+    foreach ( array( 'api', 'helper', 'twig' ) as $attribute )
     {
-        return __DIR__ . '/../Resources/config/schema';
+      $container->setParameter( 'fos_facebook.' . $attribute . '.class', $config[ 'class' ][ $attribute ] );
     }
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function getNamespace()
+
+    foreach ( array( 'app_id', 'secret', 'cookie', 'domain', 'logging', 'culture', 'permissions' ) as $attribute )
     {
-        return 'http://symfony.com/schema/dic/fos_facebook';
+      $container->setParameter( 'fos_facebook.' . $attribute, $config[ $attribute ] );
     }
-
-    /**
-     * @codeCoverageIgnore
-     */
-    protected function loadDefaults($container)
+
+    if ( isset( $config[ 'file' ] ) && $container->hasDefinition( 'fos_facebook.api' ) )
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-
-        foreach ($this->resources as $resource) {
-            $loader->load($resource);
-        }
+      $facebookApi = $container->getDefinition( 'fos_facebook.api' );
+      $facebookApi->setFile( $config[ 'file' ] );
+    }
+  }
+
+  /**
+   * @codeCoverageIgnore
+   */
+
+  public function getXsdValidationBasePath( )
+  {
+    return __DIR__ . '/../Resources/config/schema';
+  }
+
+  /**
+   * @codeCoverageIgnore
+   */
+
+  public function getNamespace( )
+  {
+    return 'http://symfony.com/schema/dic/fos_facebook';
+  }
+
+  /**
+   * @codeCoverageIgnore
+   */
+
+  protected function loadDefaults( $container )
+  {
+    $loader = new XmlFileLoader( $container, new FileLocator( __DIR__ . '/../Resources/config'));
+
+    foreach ( $this->resources as $resource )
+    {
+      $loader->load( $resource );
     }
+  }
 }

DependencyInjection/Security/Factory/FacebookFactory.php

@@ -18,60 +18,57 @@
 
 class FacebookFactory extends AbstractFactory
 {
-    public function __construct()
+
+  public function __construct( )
+  {
+    $this->addOption( 'display', 'page' );
+    $this->addOption( 'app_url' );
+    $this->addOption( 'server_url' );
+    $this->addOption( 'create_user_if_not_exists', false );
+  }
+
+  public function getPosition( )
+  {
+    return 'pre_auth';
+  }
+
+  public function getKey( )
+  {
+    return 'fos_facebook';
+  }
+
+  protected function getListenerId( )
+  {
+    return 'fos_facebook.security.authentication.listener';
+  }
+
+  protected function createAuthProvider( ContainerBuilder $container, $id, $config, $userProviderId )
+  {
+    $authProviderId = 'fos_facebook.auth.' . $id;
+
+    $definition = $container->setDefinition( $authProviderId, new DefinitionDecorator( 'fos_facebook.auth') )
+        ->replaceArgument( 0, $id );
+
+    // with user provider
+    if ( isset( $config[ 'provider' ] ) )
     {
-        $this->addOption('display', 'page');
-        $this->addOption('app_url');
-        $this->addOption('server_url');
-        $this->addOption('create_user_if_not_exists', false);
-    }
-
-    public function getPosition()
-    {
-        return 'pre_auth';
-    }
-
-    public function getKey()
-    {
-        return 'fos_facebook';
-    }
-
-    protected function getListenerId()
-    {
-        return 'fos_facebook.security.authentication.listener';
-    }
-
-    protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
-    {
-        $authProviderId = 'fos_facebook.auth.'.$id;
-
-        $definition = $container
-            ->setDefinition($authProviderId, new DefinitionDecorator('fos_facebook.auth'))
-            ->replaceArgument(0, $id);
-
-        // with user provider
-        if (isset($config['provider'])) {
-            $definition
-                ->addArgument(new Reference($userProviderId))
-                ->addArgument(new Reference('security.user_checker'))
-                ->addArgument($config['create_user_if_not_exists'])
-            ;
-        }
-
-        return $authProviderId;
-    }
-
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPointId)
-    {
-        $entryPointId = 'fos_facebook.security.authentication.entry_point.'.$id;
-        $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('fos_facebook.security.authentication.entry_point'))
-            ->replaceArgument(1, $config)
-        ;
-
-        // set options to container for use by other classes
-        $container->setParameter('fos_facebook.options.'.$id, $config);
-
-        return $entryPointId;
+      $definition->addArgument( new Reference( $userProviderId) )->addArgument( new Reference( 'security.user_checker') )
+          ->addArgument( $config[ 'create_user_if_not_exists' ] );
     }
+
+    return $authProviderId;
+  }
+
+  protected function createEntryPoint( $container, $id, $config, $defaultEntryPointId )
+  {
+    $entryPointId = 'fos_facebook.security.authentication.entry_point.' . $id;
+    $container
+        ->setDefinition( $entryPointId, new DefinitionDecorator( 'fos_facebook.security.authentication.entry_point') )
+        ->replaceArgument( 1, $config );
+
+    // set options to container for use by other classes
+    $container->setParameter( 'fos_facebook.options.' . $id, $config );
+
+    return $entryPointId;
+  }
 }

FOSFacebookBundle.php

@@ -10,18 +10,18 @@
  */
 
 namespace FOS\FacebookBundle;
-
 use FOS\FacebookBundle\DependencyInjection\Security\Factory\FacebookFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class FOSFacebookBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
-    {
-        parent::build($container);
-
-        $extension = $container->getExtension('security');
-        $extension->addSecurityListenerFactory(new FacebookFactory());
-    }
+
+  public function build( ContainerBuilder $container )
+  {
+    parent::build( $container );
+
+    $extension = $container->getExtension( 'security' );
+    $extension->addSecurityListenerFactory( new FacebookFactory( ) );
+  }
 }