login without oauth

app/Resources/FOSUserBundle/views/layout.html.twig

@@ -1,6 +1,6 @@
 {% extends '::default/index.html.twig' %}
 
-{% block title %}Demo Application{% endblock %}
+{% block title %}Caisse{% endblock %}
 
     {% block body %}
         <div class="container">

app/Resources/HWIOAuthBundle/Controller/ConnectController.php

@@ -0,0 +1,496 @@
+<?php
+
+/*
+ * This file is part of the HWIOAuthBundle package.
+ *
+ * (c) Hardware.Info <opensource@hardware.info>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace HWI\Bundle\OAuthBundle\Controller;
+
+use HWI\Bundle\OAuthBundle\Event\FilterUserResponseEvent;
+use HWI\Bundle\OAuthBundle\Event\FormEvent;
+use HWI\Bundle\OAuthBundle\Event\GetResponseUserEvent;
+use HWI\Bundle\OAuthBundle\HWIOAuthEvents;
+use HWI\Bundle\OAuthBundle\OAuth\ResourceOwnerInterface;
+use HWI\Bundle\OAuthBundle\OAuth\Response\UserResponseInterface;
+use HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken;
+use HWI\Bundle\OAuthBundle\Security\Core\Exception\AccountNotLinkedException;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AccountStatusException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+use Symfony\Component\Security\Http\SecurityEvents;
+
+/**
+ * @author Alexander <iam.asm89@gmail.com>
+ */
+class ConnectController extends Controller {
+	private $tokenManager;
+
+	public function __construct( CsrfTokenManagerInterface $tokenManager = null ) {
+		$this->tokenManager = $tokenManager;
+	}
+
+	/**
+	 * Action that handles the login 'form'. If connecting is enabled the
+	 * user will be redirected to the appropriate login urls or registration forms.
+	 *
+	 * @param Request $request
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return Response
+	 */
+	public function connectAction( Request $request ) {
+		var_dump( "overrided" );
+		$connect = $this->container->getParameter( 'hwi_oauth.connect' );
+		$hasUser = $this->getUser() ? $this->isGranted( $this->container->getParameter( 'hwi_oauth.grant_rule' ) ) : false;
+
+		$error = $this->getErrorForRequest( $request );
+
+		// if connecting is enabled and there is no user, redirect to the registration form
+		if ( $connect && ! $hasUser && $error instanceof AccountNotLinkedException ) {
+			$key     = time();
+			$session = $request->getSession();
+			$session->set( '_hwi_oauth.registration_error.' . $key, $error );
+
+			return $this->redirectToRoute( 'hwi_oauth_connect_registration', [ 'key' => $key ] );
+		}
+
+		if ( $error ) {
+			if ( $error instanceof AuthenticationException ) {
+				$error = $error->getMessageKey();
+			} else {
+				$error = $error->getMessage();
+			}
+		}
+		$csrfToken = $this->tokenManager
+			? $this->tokenManager->getToken( 'authenticate' )->getValue()
+			: null;
+
+		return $this->render( '@HWIOAuth/Connect/login.html.twig',
+			[
+				'error'      => $error,
+				'csrf_token' => $csrfToken,
+			] );
+	}
+
+	/**
+	 * Shows a registration form if there is no user logged in and connecting
+	 * is enabled.
+	 *
+	 * @param Request $request a request
+	 * @param string $key key used for retrieving the right information for the registration form
+	 *
+	 * @return Response
+	 *
+	 * @throws NotFoundHttpException if `connect` functionality was not enabled
+	 * @throws AccessDeniedException if any user is authenticated
+	 * @throws \RuntimeException
+	 */
+	public function registrationAction( Request $request, $key ) {
+		$connect = $this->container->getParameter( 'hwi_oauth.connect' );
+		if ( ! $connect ) {
+			throw new NotFoundHttpException();
+		}
+
+		$hasUser = $this->isGranted( $this->container->getParameter( 'hwi_oauth.grant_rule' ) );
+		if ( $hasUser ) {
+			throw new AccessDeniedException( 'Cannot connect already registered account.' );
+		}
+
+		$session = $request->getSession();
+		$error   = $session->get( '_hwi_oauth.registration_error.' . $key );
+		$session->remove( '_hwi_oauth.registration_error.' . $key );
+
+		if ( ! $error instanceof AccountNotLinkedException ) {
+			throw new \RuntimeException( 'Cannot register an account.',
+				0,
+				$error instanceof \Exception ? $error : null );
+		}
+
+		$userInformation = $this
+			->getResourceOwnerByName( $error->getResourceOwnerName() )
+			->getUserInformation( $error->getRawToken() );
+
+		/* @var $form FormInterface */
+		if ( $this->container->getParameter( 'hwi_oauth.fosub_enabled' ) ) {
+			// enable compatibility with FOSUserBundle 1.3.x and 2.x
+			if ( interface_exists( 'FOS\UserBundle\Form\Factory\FactoryInterface' ) ) {
+				$form = $this->container->get( 'hwi_oauth.registration.form.factory' )->createForm();
+			} else {
+				$form = $this->container->get( 'hwi_oauth.registration.form' );
+			}
+		} else {
+			$form = $this->container->get( 'hwi_oauth.registration.form' );
+		}
+
+		$formHandler = $this->container->get( 'hwi_oauth.registration.form.handler' );
+		if ( $formHandler->process( $request, $form, $userInformation ) ) {
+			$event = new FormEvent( $form, $request );
+			$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::REGISTRATION_SUCCESS, $event );
+
+			$this->container->get( 'hwi_oauth.account.connector' )->connect( $form->getData(), $userInformation );
+
+			// Authenticate the user
+			$this->authenticateUser( $request,
+				$form->getData(),
+				$error->getResourceOwnerName(),
+				$error->getAccessToken() );
+
+			if ( null === $response = $event->getResponse() ) {
+				if ( $targetPath = $this->getTargetPath( $session ) ) {
+					$response = $this->redirect( $targetPath );
+				} else {
+					$response = $this->render( '@HWIOAuth/Connect/registration_success.html.twig',
+						[
+							'userInformation' => $userInformation,
+						] );
+				}
+			}
+
+			$event = new FilterUserResponseEvent( $form->getData(), $request, $response );
+			$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::REGISTRATION_COMPLETED, $event );
+
+			return $response;
+		}
+
+		// reset the error in the session
+		$session->set( '_hwi_oauth.registration_error.' . $key, $error );
+
+		$event = new GetResponseUserEvent( $form->getData(), $request );
+		$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::REGISTRATION_INITIALIZE, $event );
+
+		if ( $response = $event->getResponse() ) {
+			return $response;
+		}
+
+		return $this->render( '@HWIOAuth/Connect/registration.html.twig',
+			[
+				'key'             => $key,
+				'form'            => $form->createView(),
+				'userInformation' => $userInformation,
+			] );
+	}
+
+	/**
+	 * Connects a user to a given account if the user is logged in and connect is enabled.
+	 *
+	 * @param Request $request the active request
+	 * @param string $service name of the resource owner to connect to
+	 *
+	 * @throws \Exception
+	 *
+	 * @return Response
+	 *
+	 * @throws NotFoundHttpException if `connect` functionality was not enabled
+	 * @throws AccessDeniedException if no user is authenticated
+	 */
+	public function connectServiceAction( Request $request, $service ) {
+		$connect = $this->container->getParameter( 'hwi_oauth.connect' );
+		if ( ! $connect ) {
+			throw new NotFoundHttpException();
+		}
+
+		$hasUser = $this->isGranted( $this->container->getParameter( 'hwi_oauth.grant_rule' ) );
+		if ( ! $hasUser ) {
+			throw new AccessDeniedException( 'Cannot connect an account.' );
+		}
+
+		// Get the data from the resource owner
+		$resourceOwner = $this->getResourceOwnerByName( $service );
+
+		$session = $request->getSession();
+		$key     = $request->query->get( 'key', time() );
+
+		if ( $resourceOwner->handles( $request ) ) {
+			$accessToken = $resourceOwner->getAccessToken(
+				$request,
+				$this->container->get( 'hwi_oauth.security.oauth_utils' )->getServiceAuthUrl( $request, $resourceOwner )
+			);
+
+			// save in session
+			$session->set( '_hwi_oauth.connect_confirmation.' . $key, $accessToken );
+		} else {
+			$accessToken = $session->get( '_hwi_oauth.connect_confirmation.' . $key );
+		}
+
+		// Redirect to the login path if the token is empty (Eg. User cancelled auth)
+		if ( null === $accessToken ) {
+			if ( $this->container->getParameter( 'hwi_oauth.failed_use_referer' ) && $targetPath = $this->getTargetPath( $session,
+					'failed_target_path' ) ) {
+				return $this->redirect( $targetPath );
+			}
+
+			return $this->redirectToRoute( $this->container->getParameter( 'hwi_oauth.failed_auth_path' ) );
+		}
+
+		$userInformation = $resourceOwner->getUserInformation( $accessToken );
+
+		// Show confirmation page?
+		if ( ! $this->container->getParameter( 'hwi_oauth.connect.confirmation' ) ) {
+			return $this->getConfirmationResponse( $request, $accessToken, $service );
+		}
+
+		// Symfony <3.0 BC
+		/** @var $form FormInterface */
+		$form = method_exists( 'Symfony\Component\Form\AbstractType', 'getBlockPrefix' )
+			? $this->createForm( FormType::class )
+			: $this->createForm( 'form' );
+		// Handle the form
+		$form->handleRequest( $request );
+
+		if ( $form->isSubmitted() && $form->isValid() ) {
+			return $this->getConfirmationResponse( $request, $accessToken, $service );
+		}
+
+		$event = new GetResponseUserEvent( $this->getUser(), $request );
+		$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::CONNECT_INITIALIZE, $event );
+
+		if ( $response = $event->getResponse() ) {
+			return $response;
+		}
+
+		return $this->render( '@HWIOAuth/Connect/connect_confirm.html.twig',
+			[
+				'key'             => $key,
+				'service'         => $service,
+				'form'            => $form->createView(),
+				'userInformation' => $userInformation,
+			] );
+	}
+
+	/**
+	 * @param Request $request
+	 * @param string $service
+	 *
+	 * @throws NotFoundHttpException
+	 *
+	 * @return RedirectResponse
+	 */
+	public function redirectToServiceAction( Request $request, $service ) {
+		try {
+			$authorizationUrl = $this->container->get( 'hwi_oauth.security.oauth_utils' )->getAuthorizationUrl( $request,
+				$service );
+		} catch ( \RuntimeException $e ) {
+			throw new NotFoundHttpException( $e->getMessage(), $e );
+		}
+
+		// Check for a return path and store it before redirect
+		if ( $request->hasSession() ) {
+			// initialize the session for preventing SessionUnavailableException
+			$session = $request->getSession();
+			$session->start();
+
+			foreach ( $this->container->getParameter( 'hwi_oauth.firewall_names' ) as $providerKey ) {
+				$sessionKey        = '_security.' . $providerKey . '.target_path';
+				$sessionKeyFailure = '_security.' . $providerKey . '.failed_target_path';
+
+				$param = $this->container->getParameter( 'hwi_oauth.target_path_parameter' );
+				if ( ! empty( $param ) && $targetUrl = $request->get( $param ) ) {
+					$session->set( $sessionKey, $targetUrl );
+				}
+
+				if ( $this->container->getParameter( 'hwi_oauth.failed_use_referer' ) && ! $session->has( $sessionKeyFailure ) && ( $targetUrl = $request->headers->get( 'Referer' ) ) && $targetUrl !== $authorizationUrl ) {
+					$session->set( $sessionKeyFailure, $targetUrl );
+				}
+
+				if ( $this->container->getParameter( 'hwi_oauth.use_referer' ) && ! $session->has( $sessionKey ) && ( $targetUrl = $request->headers->get( 'Referer' ) ) && $targetUrl !== $authorizationUrl ) {
+					$session->set( $sessionKey, $targetUrl );
+				}
+			}
+		}
+
+		return $this->redirect( $authorizationUrl );
+	}
+
+	/**
+	 * Get the security error for a given request.
+	 *
+	 * @param Request $request
+	 *
+	 * @return string|\Exception
+	 */
+	protected function getErrorForRequest( Request $request ) {
+		$authenticationErrorKey = Security::AUTHENTICATION_ERROR;
+
+		$session = $request->getSession();
+		if ( $request->attributes->has( $authenticationErrorKey ) ) {
+			$error = $request->attributes->get( $authenticationErrorKey );
+		} elseif ( null !== $session && $session->has( $authenticationErrorKey ) ) {
+			$error = $session->get( $authenticationErrorKey );
+			$session->remove( $authenticationErrorKey );
+		} else {
+			$error = '';
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Get a resource owner by name.
+	 *
+	 * @param string $name
+	 *
+	 * @return ResourceOwnerInterface
+	 *
+	 * @throws NotFoundHttpException if there is no resource owner with the given name
+	 */
+	protected function getResourceOwnerByName( $name ) {
+		foreach ( $this->container->getParameter( 'hwi_oauth.firewall_names' ) as $firewall ) {
+			$id = 'hwi_oauth.resource_ownermap.' . $firewall;
+			if ( ! $this->container->has( $id ) ) {
+				continue;
+			}
+
+			$ownerMap = $this->container->get( $id );
+			if ( $resourceOwner = $ownerMap->getResourceOwnerByName( $name ) ) {
+				return $resourceOwner;
+			}
+		}
+
+		throw new NotFoundHttpException( sprintf( "No resource owner with name '%s'.", $name ) );
+	}
+
+	/**
+	 * Generates a route.
+	 *
+	 * @deprecated since version 0.4. Will be removed in 1.0.
+	 *
+	 * @param string $route Route name
+	 * @param array $params Route parameters
+	 * @param bool $absolute absolute url or note
+	 *
+	 * @return string
+	 */
+	protected function generate( $route, array $params = [], $absolute = false ) {
+		@trigger_error( 'The ' . __METHOD__ . ' method is deprecated since version 0.4 and will be removed in 1.0. Use Symfony\Bundle\FrameworkBundle\Controller\Controller::generateUrl instead.',
+			E_USER_DEPRECATED );
+
+		return $this->container->get( 'router' )->generate( $route, $params, $absolute );
+	}
+
+	/**
+	 * Authenticate a user with Symfony Security.
+	 *
+	 * @param Request $request
+	 * @param UserInterface $user
+	 * @param string $resourceOwnerName
+	 * @param string $accessToken
+	 * @param bool $fakeLogin
+	 */
+	protected function authenticateUser(
+		Request $request,
+		UserInterface $user,
+		$resourceOwnerName,
+		$accessToken,
+		$fakeLogin = true
+	) {
+		try {
+			$this->container->get( 'hwi_oauth.user_checker' )->checkPreAuth( $user );
+			$this->container->get( 'hwi_oauth.user_checker' )->checkPostAuth( $user );
+		} catch ( AccountStatusException $e ) {
+			// Don't authenticate locked, disabled or expired users
+			return;
+		}
+
+		$token = new OAuthToken( $accessToken, $user->getRoles() );
+		$token->setResourceOwnerName( $resourceOwnerName );
+		$token->setUser( $user );
+		$token->setAuthenticated( true );
+
+		$this->get( 'security.token_storage' )->setToken( $token );
+
+		if ( $fakeLogin ) {
+			// Since we're "faking" normal login, we need to throw our INTERACTIVE_LOGIN event manually
+			$this->container->get( 'event_dispatcher' )->dispatch(
+				SecurityEvents::INTERACTIVE_LOGIN,
+				new InteractiveLoginEvent( $request, $token )
+			);
+		}
+	}
+
+	/**
+	 * @param SessionInterface $session
+	 *
+	 * @return string|null
+	 */
+	private function getTargetPath( SessionInterface $session ) {
+		foreach ( $this->container->getParameter( 'hwi_oauth.firewall_names' ) as $providerKey ) {
+			$sessionKey = '_security.' . $providerKey . '.target_path';
+			if ( $session->has( $sessionKey ) ) {
+				return $session->get( $sessionKey );
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param Request $request The active request
+	 * @param array $accessToken The access token
+	 * @param string $service Name of the resource owner to connect to
+	 *
+	 * @return Response
+	 *
+	 * @throws NotFoundHttpException if there is no resource owner with the given name
+	 */
+	private function getConfirmationResponse( Request $request, array $accessToken, $service ) {
+		/** @var $currentToken OAuthToken */
+		$currentToken = $this->container->get( 'security.token_storage' )->getToken();
+		/** @var $currentUser UserInterface */
+		$currentUser = $currentToken->getUser();
+
+		/** @var $resourceOwner ResourceOwnerInterface */
+		$resourceOwner = $this->getResourceOwnerByName( $service );
+		/** @var $userInformation UserResponseInterface */
+		$userInformation = $resourceOwner->getUserInformation( $accessToken );
+
+		$event = new GetResponseUserEvent( $currentUser, $request );
+		$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::CONNECT_CONFIRMED, $event );
+
+		$this->container->get( 'hwi_oauth.account.connector' )->connect( $currentUser, $userInformation );
+
+		if ( $currentToken instanceof OAuthToken ) {
+			// Update user token with new details
+			$newToken =
+				is_array( $accessToken ) &&
+				( isset( $accessToken[ 'access_token' ] ) || isset( $accessToken[ 'oauth_token' ] ) ) ?
+					$accessToken : $currentToken->getRawToken();
+
+			$this->authenticateUser( $request, $currentUser, $service, $newToken, false );
+		}
+
+		if ( null === $response = $event->getResponse() ) {
+			if ( $targetPath = $this->getTargetPath( $request->getSession() ) ) {
+				$response = $this->redirect( $targetPath );
+			} else {
+				$response = $this->render( '@HWIOAuth/Connect/connect_success.html.twig',
+					[
+						'userInformation' => $userInformation,
+						'service'         => $service,
+					] );
+			}
+		}
+
+		$event = new FilterUserResponseEvent( $currentUser, $request, $response );
+		$this->get( 'event_dispatcher' )->dispatch( HWIOAuthEvents::CONNECT_COMPLETED, $event );
+
+		return $response;
+	}
+}

app/Resources/HWIOAuthBundle/views/layout.html.twig

@@ -5,57 +5,35 @@
     <h2>Le login</h2>
     <div class="row">
         <div class="col-xs-6">
+            {% trans_default_domain 'FOSUserBundle' %}
+
+            {% if error %}
+                <div>{{ error|trans }}</div>
+            {% endif %}
+
             <form action="{{ path("fos_user_security_check") }}" method="post">
-                {#<input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>#}
-                {#{{ form_rest(form) }}#}
-                {% if error %}
-                    <div class="text-danger">{{ error|trans({}, 'FOSUserBundle') }}</div>
+                {% if csrf_token is defined %}
+                    <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
                 {% endif %}
-                <div style="margin-bottom: 25px" class="input-group">
-                    <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
-                    {% if last_sername is defined %}
-                        <input type="text" id="username" name="_username" value="{{ last_username }}"
-                                required="required " class="form-control" id="username"
-                                placeholder="{% trans %}Username{% endtrans %}">
-                    {% else %}
-                        <input type="text" id="username" name="_username" value=""
-                                required="required " class="form-control" id="username"
-                                placeholder="{% trans %}Username{% endtrans %}">
-                    {% endif %}
 
+                <label for="username">{{ 'security.login.username'|trans }}</label>
+                <input type="text" id="username" name="_username" value="" required="required"
+                        autocomplete="username"/>
 
-                </div>
+                <label for="password">{{ 'security.login.password'|trans }}</label>
+                <input type="password" id="password" name="_password" required="required"
+                        autocomplete="current-password"/>
 
-                <div style="margin-bottom: 25px" class="input-group">
-                    <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
-                    <input type="password" id="password" name="_password" required="required"
-                            class="form-control"
-                            id="password" placeholder="{% trans %}Password{% endtrans %}">
-                </div>
                 <input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
-                <label for="remember_me">{% trans %}Remember me{% endtrans %}</label>
-                <br>
-                <!-- <font color=blue Garder ma session active  /font>-->
-
-
-                <input type="submit" id="_submit" class="btn btn-primary btn-block" name="_submit"
-                        value="connexion"/>
-                <br>
-                <fieldset>
-                    <a href="{{ path("fos_user_resetting_request") }}">
-                        {% trans %}Forgot your password
-                            ?{% endtrans %}</a>
-                    <br>
-                    <a href="{{ path('fos_user_registration_register') }}">
-                        {% trans %}You don't have an account
-                            ?{% endtrans %} </a>
-                </fieldset>
+                <label for="remember_me">{{ 'security.login.remember_me'|trans }}</label>
 
+                <input type="submit" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans }}"/>
             </form>
+
         </div>
         <div class="col-xs-6">
-            {#{% block hwi_oauth_content %}#}
-            {#{% endblock hwi_oauth_content %}#}
+            {% block hwi_oauth_content %}
+            {% endblock %}
         </div>
     </div>
 

app/config/config.yml

@@ -75,6 +75,9 @@ fos_user:
     db_driver: orm # other valid values are 'mongodb' and 'couchdb'
     firewall_name: main
     user_class: AppBundle\Entity\User
+    registration:
+        confirmation:
+            enabled: true
     from_email:
         address: "%mailer_user%"
         sender_name: "%mailer_user%"

app/config/routing.yml

@@ -6,9 +6,9 @@ hwi_oauth_connect:
     resource: "@HWIOAuthBundle/Resources/config/routing/connect.xml"
     prefix:   /connect
 
-hwi_oauth_login:
-    resource: "@HWIOAuthBundle/Resources/config/routing/login.xml"
-    prefix:   /login
+#hwi_oauth_login:
+#    resource: "@HWIOAuthBundle/Resources/config/routing/login.xml"
+#    prefix:   /login
 facebook_login:
     path: /login/check-facebook
 

assets/js/app.js

@@ -1,2 +1,2 @@
 require('../css/app.scss');
-require('./main.js');
+require('./parts/main.js');

src/AppBundle/Controller/DefaultController.php

@@ -6,8 +6,16 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 class DefaultController extends Controller {
+
+	private $tokenManager;
+
+	public function __construct( CsrfTokenManagerInterface $tokenManager = null ) {
+		$this->tokenManager = $tokenManager;
+	}
+
 	/**
 	 * @Route("/", name="homepage")
 	 */