Compare commits
1 Commits
9cc4c7ac74
...
fa987f5d44
Author | SHA1 | Date | |
---|---|---|---|
fa987f5d44 |
3
Makefile
3
Makefile
@ -5,6 +5,9 @@ IMAGES := $(foreach file, $(wildcard $(IMAGES_DIR)/*), $(basename $(notdir $(fil
|
|||||||
|
|
||||||
TRIVY_ARGS ?=
|
TRIVY_ARGS ?=
|
||||||
|
|
||||||
|
php-cs-fixer:
|
||||||
|
PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer/vendor/bin/php-cs-fixer -v fix --config=./tools/php-cs-fixer/.php-cs-fixer.dist.php
|
||||||
|
|
||||||
build-image: $(foreach image, $(IMAGES), build-image-$(image))
|
build-image: $(foreach image, $(IMAGES), build-image-$(image))
|
||||||
|
|
||||||
build-image-%:
|
build-image-%:
|
||||||
|
@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
namespace App\Altcha\Form;
|
namespace App\Altcha\Form;
|
||||||
|
|
||||||
use App\Altcha\AltchaValidator;
|
|
||||||
use App\Altcha\AltchaTransformer;
|
use App\Altcha\AltchaTransformer;
|
||||||
use Symfony\Component\Form\FormView;
|
use App\Altcha\AltchaValidator;
|
||||||
use Symfony\Component\Form\FormEvents;
|
|
||||||
use Symfony\Component\Form\AbstractType;
|
use Symfony\Component\Form\AbstractType;
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
|
||||||
use Symfony\Component\Form\FormBuilderInterface;
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
|
use Symfony\Component\Form\FormEvents;
|
||||||
|
use Symfony\Component\Form\FormInterface;
|
||||||
|
use Symfony\Component\Form\FormView;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
|
||||||
|
|
||||||
class AltchaType extends AbstractType
|
class AltchaType extends AbstractType
|
||||||
{
|
{
|
||||||
|
@ -5,10 +5,10 @@ namespace App\Flag\Controller;
|
|||||||
use App\Flag\FlagEnum;
|
use App\Flag\FlagEnum;
|
||||||
use Predis\ClientInterface;
|
use Predis\ClientInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
|
||||||
|
|
||||||
class FlagController extends AbstractController
|
class FlagController extends AbstractController
|
||||||
{
|
{
|
||||||
|
@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
namespace App\Form;
|
namespace App\Form;
|
||||||
|
|
||||||
use App\Flag\FlagEnum;
|
|
||||||
use Predis\Client;
|
|
||||||
use App\Flag\FlagAccessor;
|
|
||||||
use App\Altcha\Form\AltchaType;
|
use App\Altcha\Form\AltchaType;
|
||||||
|
use App\Flag\FlagAccessor;
|
||||||
|
use App\Flag\FlagEnum;
|
||||||
use Symfony\Component\Form\AbstractType;
|
use Symfony\Component\Form\AbstractType;
|
||||||
use Symfony\Component\Form\FormBuilderInterface;
|
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
|
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
|
|
||||||
class LoginType extends AbstractType
|
class LoginType extends AbstractType
|
||||||
{
|
{
|
||||||
@ -43,7 +42,7 @@ class LoginType extends AbstractType
|
|||||||
$builder->add('altcha', AltchaType::class, [
|
$builder->add('altcha', AltchaType::class, [
|
||||||
'label' => false,
|
'label' => false,
|
||||||
]);
|
]);
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver): void
|
public function configureOptions(OptionsResolver $resolver): void
|
||||||
|
@ -44,7 +44,7 @@ class HydraService extends AbstractController
|
|||||||
// si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect
|
// si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect
|
||||||
$this->session->set('challenge', $loginRequestInfo['challenge']);
|
$this->session->set('challenge', $loginRequestInfo['challenge']);
|
||||||
|
|
||||||
return new RedirectResponse($this->baseUrl . '/connect/login-accept');
|
return new RedirectResponse($this->baseUrl.'/connect/login-accept');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handleConsentRequest(Request $request): RedirectResponse
|
public function handleConsentRequest(Request $request): RedirectResponse
|
||||||
|
2
tools/php-cs-fixer/.php-cs-fixer.dist.php
Normal file → Executable file
2
tools/php-cs-fixer/.php-cs-fixer.dist.php
Normal file → Executable file
@ -5,8 +5,6 @@ $finder = PhpCsFixer\Finder::create()
|
|||||||
->name('*.php')
|
->name('*.php')
|
||||||
;
|
;
|
||||||
|
|
||||||
// TODO: Définir les règles de style communes
|
|
||||||
// spécifiques au projet
|
|
||||||
return (new PhpCsFixer\Config())
|
return (new PhpCsFixer\Config())
|
||||||
->setRules([
|
->setRules([
|
||||||
'@Symfony' => true,
|
'@Symfony' => true,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user