Skip to content

Check if form is submitted on resource creation/edition #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lchrusciel merged 2 commits into from
Aug 31, 2020
Merged

Check if form is submitted on resource creation/edition #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0015d40
Check if form is submitted on resource creation/edition
loic425 Jul 3, 2020
a31847c
Handle request before checking if form is valid
loic425 Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Bundle/Controller/ResourceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,9 @@ public function createAction(Request $request): Response
$newResource = $this->newResourceFactory->create($configuration, $this->factory);

$form = $this->resourceFormFactory->create($configuration, $newResource);
$form->handleRequest($request);

if ($request->isMethod('POST') && $form->handleRequest($request)->isValid()) {
if ($request->isMethod('POST') && $form->isSubmitted() && $form->isValid()) {
$newResource = $form->getData();

$event = $this->eventDispatcher->dispatchPreEvent(ResourceActions::CREATE, $configuration, $newResource);
Expand Down Expand Up @@ -247,8 +248,13 @@ public function updateAction(Request $request): Response
$resource = $this->findOr404($configuration);

$form = $this->resourceFormFactory->create($configuration, $resource);
$form->handleRequest($request);

if (in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true) && $form->handleRequest($request)->isValid()) {
if (
in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true)
&& $form->isSubmitted()
&& $form->isValid()
) {
$resource = $form->getData();

/** @var ResourceControllerEvent $event */
Expand Down
220 changes: 217 additions & 3 deletions src/Bundle/spec/Controller/ResourceControllerSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ function it_returns_a_html_response_for_creating_new_resource_form(

$twig->render('@SyliusShop/Product/create.html.twig', $expectedContext)->willReturn('view');

$form->handleRequest($request)->shouldBeCalled();
$twig->render('@SyliusShop/Product/create.html.twig', $expectedContext)->shouldBeCalled();

$this->createAction($request);
Expand Down Expand Up @@ -410,6 +411,7 @@ function it_returns_a_html_response_for_invalid_form_during_resource_creation(

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(false);
$form->createView()->willReturn($formView);

Expand All @@ -432,6 +434,66 @@ function it_returns_a_html_response_for_invalid_form_during_resource_creation(
$this->createAction($request);
}

function it_returns_a_html_response_for_not_submitted_form_during_resource_creation(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
RequestConfiguration $configuration,
AuthorizationCheckerInterface $authorizationChecker,
FactoryInterface $factory,
NewResourceFactoryInterface $newResourceFactory,
ResourceInterface $newResource,
ResourceFormFactoryInterface $resourceFormFactory,
EventDispatcherInterface $eventDispatcher,
ResourceControllerEvent $event,
Form $form,
FormView $formView,
ContainerInterface $container,
Environment $twig,
Request $request
): void {
$metadata->getApplicationName()->willReturn('sylius');
$metadata->getName()->willReturn('product');

$requestConfigurationFactory->create($metadata, $request)->willReturn($configuration);
$configuration->hasPermission()->willReturn(true);
$configuration->getPermission(ResourceActions::CREATE)->willReturn('sylius.product.create');

$authorizationChecker->isGranted($configuration, 'sylius.product.create')->willReturn(true);

$configuration->isHtmlRequest()->willReturn(true);
$configuration->getTemplate(ResourceActions::CREATE . '.html')->willReturn('@SyliusShop/Product/create.html.twig');

$newResourceFactory->create($configuration, $factory)->willReturn($newResource);
$resourceFormFactory->create($configuration, $newResource)->willReturn($form);

$eventDispatcher->dispatchInitializeEvent(ResourceActions::CREATE, $configuration, $newResource)->willReturn($event);
$event->isStopped()->willReturn(false);
$event->getResponse()->willReturn(null);

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(false);
$form->createView()->willReturn($formView);

$container->has('templating')->willReturn(false);
$container->has('twig')->willReturn(true);
$container->get('twig')->willReturn($twig);

$expectedContext = [
'configuration' => $configuration,
'metadata' => $metadata,
'resource' => $newResource,
'product' => $newResource,
'form' => $formView,
];

$twig->render('@SyliusShop/Product/create.html.twig', $expectedContext)->willReturn('view');

$twig->render('@SyliusShop/Product/create.html.twig', $expectedContext)->shouldBeCalled();

$this->createAction($request);
}

function it_returns_a_non_html_response_for_invalid_form_during_resource_creation(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
Expand Down Expand Up @@ -463,6 +525,7 @@ function it_returns_a_non_html_response_for_invalid_form_during_resource_creatio

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(false);

$expectedView = View::create($form, 400);
Expand All @@ -472,6 +535,46 @@ function it_returns_a_non_html_response_for_invalid_form_during_resource_creatio
$this->createAction($request)->shouldReturn($response);
}

function it_returns_a_non_html_response_for_not_submitted_form_during_resource_creation(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
RequestConfiguration $configuration,
AuthorizationCheckerInterface $authorizationChecker,
ViewHandlerInterface $viewHandler,
FactoryInterface $factory,
NewResourceFactoryInterface $newResourceFactory,
ResourceInterface $newResource,
ResourceFormFactoryInterface $resourceFormFactory,
Form $form,
Request $request,
Response $response
): void {
$metadata->getApplicationName()->willReturn('sylius');
$metadata->getName()->willReturn('product');

$requestConfigurationFactory->create($metadata, $request)->willReturn($configuration);
$configuration->hasPermission()->willReturn(true);
$configuration->getPermission(ResourceActions::CREATE)->willReturn('sylius.product.create');

$authorizationChecker->isGranted($configuration, 'sylius.product.create')->willReturn(true);

$configuration->isHtmlRequest()->willReturn(false);
$configuration->getTemplate(ResourceActions::CREATE . '.html')->willReturn('@SyliusShop/Product/create.html.twig');

$newResourceFactory->create($configuration, $factory)->willReturn($newResource);
$resourceFormFactory->create($configuration, $newResource)->willReturn($form);

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(false);

$expectedView = View::create($form, 400);

$viewHandler->handle($configuration, Argument::that($this->getViewComparingCallback($expectedView)))->willReturn($response);

$this->createAction($request)->shouldReturn($response);
}

function it_does_not_create_the_resource_and_redirects_to_index_for_html_requests_stopped_via_events(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
Expand Down Expand Up @@ -508,6 +611,7 @@ function it_does_not_create_the_resource_and_redirects_to_index_for_html_request

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -561,6 +665,7 @@ function it_does_not_create_the_resource_and_return_response_for_html_requests_s

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -618,6 +723,7 @@ function it_redirects_to_newly_created_resource(

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -674,6 +780,7 @@ function it_uses_response_from_post_create_event_if_defined(

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -729,6 +836,7 @@ function it_returns_a_non_html_response_for_correctly_created_resources(

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -782,6 +890,7 @@ function it_does_not_create_the_resource_and_throws_http_exception_for_non_html_

$request->isMethod('POST')->willReturn(true);
$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($newResource);

Expand Down Expand Up @@ -920,8 +1029,7 @@ function it_returns_a_html_response_for_invalid_form_during_resource_update(
FormView $formView,
ContainerInterface $container,
Environment $twig,
Request $request,
Response $response
Request $request
): void {
$metadata->getApplicationName()->willReturn('sylius');
$metadata->getName()->willReturn('product');
Expand All @@ -947,6 +1055,7 @@ function it_returns_a_html_response_for_invalid_form_during_resource_update(

$form->handleRequest($request)->willReturn($form);

$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(false);
$form->createView()->willReturn($formView);

Expand All @@ -969,6 +1078,69 @@ function it_returns_a_html_response_for_invalid_form_during_resource_update(
$this->updateAction($request);
}

function it_returns_a_html_response_for_not_submitted_form_during_resource_update(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
RequestConfiguration $configuration,
AuthorizationCheckerInterface $authorizationChecker,
RepositoryInterface $repository,
SingleResourceProviderInterface $singleResourceProvider,
ResourceInterface $resource,
ResourceFormFactoryInterface $resourceFormFactory,
EventDispatcherInterface $eventDispatcher,
ResourceControllerEvent $event,
Form $form,
FormView $formView,
ContainerInterface $container,
Environment $twig,
Request $request
): void {
$metadata->getApplicationName()->willReturn('sylius');
$metadata->getName()->willReturn('product');

$requestConfigurationFactory->create($metadata, $request)->willReturn($configuration);
$configuration->hasPermission()->willReturn(true);
$configuration->getPermission(ResourceActions::UPDATE)->willReturn('sylius.product.update');

$authorizationChecker->isGranted($configuration, 'sylius.product.update')->willReturn(true);

$configuration->isHtmlRequest()->willReturn(true);
$configuration->getTemplate(ResourceActions::UPDATE . '.html')->willReturn('@SyliusShop/Product/update.html.twig');

$singleResourceProvider->get($configuration, $repository)->willReturn($resource);
$resourceFormFactory->create($configuration, $resource)->willReturn($form);

$eventDispatcher->dispatchInitializeEvent(ResourceActions::UPDATE, $configuration, $resource)->willReturn($event);
$event->isStopped()->willReturn(false);
$event->getResponse()->willReturn(null);

$request->isMethod('PATCH')->willReturn(false);
$request->getMethod()->willReturn('PUT');

$form->handleRequest($request)->willReturn($form);

$form->isSubmitted()->willReturn(false);
$form->createView()->willReturn($formView);

$container->has('templating')->willReturn(false);
$container->has('twig')->willReturn(true);
$container->get('twig')->willReturn($twig);

$expectedContext = [
'configuration' => $configuration,
'metadata' => $metadata,
'resource' => $resource,
'product' => $resource,
'form' => $formView,
];

$twig->render('@SyliusShop/Product/update.html.twig', $expectedContext)->willReturn('view');

$twig->render('@SyliusShop/Product/update.html.twig', $expectedContext)->shouldBeCalled();

$this->updateAction($request);
}

function it_returns_a_non_html_response_for_invalid_form_during_resource_update(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
Expand Down Expand Up @@ -1000,6 +1172,7 @@ function it_returns_a_non_html_response_for_invalid_form_during_resource_update(
$request->getMethod()->willReturn('PATCH');

$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(false);

$expectedView = View::create($form, 400);
Expand All @@ -1008,6 +1181,45 @@ function it_returns_a_non_html_response_for_invalid_form_during_resource_update(
$this->updateAction($request)->shouldReturn($response);
}

function it_returns_a_non_html_response_for_not_submitted_form_during_resource_update(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
RequestConfiguration $configuration,
AuthorizationCheckerInterface $authorizationChecker,
ViewHandlerInterface $viewHandler,
RepositoryInterface $repository,
SingleResourceProviderInterface $singleResourceProvider,
ResourceInterface $resource,
ResourceFormFactoryInterface $resourceFormFactory,
Form $form,
Request $request,
Response $response
): void {
$metadata->getApplicationName()->willReturn('sylius');
$metadata->getName()->willReturn('product');

$requestConfigurationFactory->create($metadata, $request)->willReturn($configuration);
$configuration->hasPermission()->willReturn(true);
$configuration->getPermission(ResourceActions::UPDATE)->willReturn('sylius.product.update');
$configuration->isHtmlRequest()->willReturn(false);

$authorizationChecker->isGranted($configuration, 'sylius.product.update')->willReturn(true);

$singleResourceProvider->get($configuration, $repository)->willReturn($resource);
$resourceFormFactory->create($configuration, $resource)->willReturn($form);

$request->isMethod('PATCH')->willReturn(true);
$request->getMethod()->willReturn('PATCH');

$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(false);

$expectedView = View::create($form, 400);
$viewHandler->handle($configuration, Argument::that($this->getViewComparingCallback($expectedView)))->willReturn($response);

$this->updateAction($request)->shouldReturn($response);
}

function it_does_not_update_the_resource_and_redirects_to_resource_for_html_request_if_stopped_via_event(
MetadataInterface $metadata,
RequestConfigurationFactoryInterface $requestConfigurationFactory,
Expand Down Expand Up @@ -1196,7 +1408,6 @@ function it_uses_response_from_initialize_create_event_if_defined(
EventDispatcherInterface $eventDispatcher,
ResourceControllerEvent $initializeEvent,
Form $form,
FormView $formView,
ContainerInterface $container,
Environment $twig,
Request $request,
Expand Down Expand Up @@ -1235,6 +1446,7 @@ function it_uses_response_from_initialize_create_event_if_defined(
$twig->render(Argument::cetera())->willReturn('view');

$twig->render(Argument::cetera())->shouldNotBeCalled();
$form->handleRequest($request)->shouldBeCalled();

$this->createAction($request);
}
Expand Down Expand Up @@ -1333,6 +1545,7 @@ function it_returns_a_non_html_response_for_correctly_updated_resource(
$request->getMethod()->willReturn('PUT');

$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($resource);

Expand Down Expand Up @@ -1380,6 +1593,7 @@ function it_does_not_update_the_resource_throws_a_http_exception_for_non_html_re
$request->getMethod()->willReturn('PUT');

$form->handleRequest($request)->willReturn($form);
$form->isSubmitted()->willReturn(true);
$form->isValid()->willReturn(true);
$form->getData()->willReturn($resource);

Expand Down