-
-
+
+ {% include 'default/footer.html.twig' %}
{% endblock %}
diff --git a/app/Resources/HWIOAuthBundle/Controller/ConnectController.php b/app/Resources/HWIOAuthBundle/Controller/ConnectController.php
deleted file mode 100755
index 62ef413b..00000000
--- a/app/Resources/HWIOAuthBundle/Controller/ConnectController.php
+++ /dev/null
@@ -1,496 +0,0 @@
-
- *
- * 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
- */
-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;
- }
-}
diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig
index 5703455e..66640074 100755
--- a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig
+++ b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig
@@ -1,14 +1,91 @@
+{% trans_default_domain 'FOSUserBundle' %}
{% extends '@HWIOAuth/layout.html.twig' %}
+ {% block bigMain %}
+ {% include 'default/header.html.twig' %}
+
+
+
+
+
+
+
+
+
+
+
+
+ En raison de maintenance technique, seul le login via twitter fonctionne
+ actuellement.
+
+ {#{% if error %}#}
-{% block hwi_oauth_content %}
- {% if error is defined and error %}
-
{{ error }}
- {% endif %}
- {% for owner in hwi_oauth_resource_owners() %}
-
-
-
- {% endfor %}
-{% endblock hwi_oauth_content %}
+ {#
{{ error|trans }}
#}
+ {#{% endif %}#}
+
+ {#
#}
+
+
+
+
+
+
+
+
+
+
+ {% include 'default/footer.html.twig' %}
+ {% endblock %}
diff --git a/app/Resources/HWIOAuthBundle/views/layout.html.twig b/app/Resources/HWIOAuthBundle/views/layout.html.twig
index 7496c453..1dda6386 100755
--- a/app/Resources/HWIOAuthBundle/views/layout.html.twig
+++ b/app/Resources/HWIOAuthBundle/views/layout.html.twig
@@ -14,6 +14,8 @@
-
{% block hwi_oauth_content %}
@@ -38,4 +39,4 @@
-{% endblock body %}
+{% endblock %}
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 4ea21e68..791250c1 100755
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -2,27 +2,28 @@
+
{% block title %}Fiche de compte dynamique{% endblock %}
{% block stylesheets %}
{% endblock %}
-{% if app.user is not defined %}
-
-{% else %}
-
-{% endif %}
{% block navigation %}
{% endblock %}
+ {% block bigMain %}
+
+ {% include 'default/header.html.twig' %}
- {% include 'default/header.html.twig' %}
+
{% block body %}
{% endblock %}
- {% include 'default/footer.html.twig' %}
+ {% include 'default/footer.html.twig' %}
+ {% endblock %}
{% block javascripts %}
@@ -35,7 +36,7 @@
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function () {
- var u = "//piwik.cipherbliss.com/";
+ var u = "https://piwik.cipherbliss.com/";
_paq.push(['setTrackerUrl', u + 'piwik.php']);
_paq.push(['setSiteId', '1']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig
old mode 100644
new mode 100755
index 6565bdf2..bf36a696
--- a/app/Resources/views/default/description-app.html.twig
+++ b/app/Resources/views/default/description-app.html.twig
@@ -1,19 +1,19 @@
-
+
Gratuit
Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un
inventaire et des feuilles de calcul faites à l'arrache.
-
+
Flexible
Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de
responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface
d'importation simplifiée.
-
+
Portable
Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que
@@ -21,7 +21,7 @@
-
+
Open Source
@@ -32,12 +32,12 @@
.
-
+
Statistiques
Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.
-
+
Data Love
Données exportables et importables en masse librement.
diff --git a/app/Resources/views/default/footer.html.twig b/app/Resources/views/default/footer.html.twig
index 3bab2eaa..31217888 100755
--- a/app/Resources/views/default/footer.html.twig
+++ b/app/Resources/views/default/footer.html.twig
@@ -1,13 +1,14 @@
-