allow php 8

composer.json

@@ -2,7 +2,7 @@
   "type": "project",
   "license": "AGPLv3",
   "require": {
-    "php": "^7.1.3",
+    "php": ">=7.1.3",
     "ext-ctype": "*",
     "ext-iconv": "*",
     "ext-json": "*",

src/Controller/FramadateController.php

@@ -8,6 +8,12 @@ use JMS\Serializer\Type\Exception\Exception;
 use Swift_Message;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
+/**
+ * sending emails controller
+ *
+ * Class FramadateController
+ * @package App\Controller
+ */
 class FramadateController extends AbstractController {
 
 	private $mail_service;

src/Controller/PollController.php

@@ -9,6 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 /**
  * @Route("/poll")
@@ -21,7 +22,7 @@ class PollController extends AbstractController
     public function index(PollRepository $pollRepository): Response
     {
         return $this->render('poll/index.html.twig', [
-            'polls' => $pollRepository->findAll(),
+            'polls' => count($pollRepository->findAll()),
         ]);
     }
 
@@ -49,12 +50,21 @@ class PollController extends AbstractController
     }
 
     /**
+     * on cherche un sondage par son url personnalisée
      * @Route("/{id}", name="poll_show", methods={"GET"})
      */
-    public function show(Poll $poll): Response
+    public function show($id): Response
     {
+	    $repository = $this->getDoctrine()->getRepository(Poll::class);
+	    $foundPoll = $repository->findOneByCustomUrl($id);
+	    if(!$foundPoll){
+	    	return $this->json([
+	    		'message' => $id.' : not found'
+		    ], 404);
+	    }
+
         return $this->render('poll/show.html.twig', [
-            'poll' => $poll,
+            'poll' => $foundPoll,
         ]);
     }
 

src/Controller/api/PollController.php

@@ -35,69 +35,129 @@ class PollController extends FramadateController {
 	 */
 	public function getAllPollsAction() {
 		$repository = $this->getDoctrine()->getRepository( Poll::class );
-		$data       = $repository->findall();
+		$data       = $repository->findAll();
 
 
 		return $this->json( [
 			'message' => 'here are your polls',
-			'poll'    => $data,
+			'poll'    => count( $data ),
-		],
+		] );
-			200 );
 	}
 
 	/**
+	 * @param $id
+	 * message when the poll is not found
+	 * @return JsonResponse
+	 */
+	public function notFoundPoll($id){
+		return $this->json( [
+			'message' => $id . ' : poll not found',
+		],
+			404 );
+	}
+	/**
+	 * get a poll config by its custom URL, we do not want polls to be reachable by their numeric id
 	 * @Get(
 	 *     path = "/{id}",
 	 *     name = "get_poll",
-	 *     requirements = {"poll_id"="\d+"}
+	 *     requirements = {"id"="\w+"}
 	 * )
+	 *
 	 * @param SerializerInterface $serializer
-	 * @param Poll $poll
 	 * @param Request $request
 	 *
 	 * @return JsonResponse|Response
 	 */
 	public function getPollConfig(
 		SerializerInterface $serializer,
-		Poll $poll,
+		$id,
 		Request $request
 	) {
-		$pass = $poll->getPassword();
+		$repository = $this->getDoctrine()->getRepository( Poll::class );
-		$data = $request->getContent();
+		$poll       = $repository->findOneByCustomUrl( $id );
-		$data = json_decode( $data, true );
+
+		if ( ! $poll ) {
+			return $this->notFoundPoll($id);
+		}
 
 		$comments = $poll->getComments();
+		$pass     = $poll->getPassword();
 
 		$returnedPoll = [
-			'message'        => 'your poll config',
+			'message'            => 'your poll config for ' . $poll->getTitle(),
-			'poll'           => $poll,
+			'password_protected' => $pass ? 'yes' : 'no',
-			'stacks_count'   => count( $poll->getStacksOfVotes() ),
+			// TODO do not render sub objects of owner, it returns too many things
-			'stacks'         => $poll->getStacksOfVotes(),
+			'poll'               => $poll,
-			'choices_count'  => $poll->computeAnswers(),
+			'stacks_count'       => count( $poll->getStacksOfVotes() ),
-			'choices'        => $poll->getChoices(),
+			'stacks'             => $poll->getStacksOfVotes(),
+			'choices_count'      => $poll->computeAnswers(),
+			'choices'            => $poll->getChoices(),
 			'comments'       => $comments,
-			'comments_count' => count( $comments ),
+			'comments_count'     => count( $comments ),
 		];
 
 		/**
 		 * password protected content
 		 */
-		if ( $pass && $pass !== md5( $data[ 'password_input' ] ) ) {
+		if ( $pass ) {
+			// no password possibly given by this route
 			return $this->json( [
-				'message' => 'your password ' . $data[ 'password_input' ] . ' is wrong, and you should feel bad',
+				'message' => 'this is protected by a password,but you did not provide the encoded password parameter, and you should feel bad. ' ,
+			],
+				403 );
+
+		} else {
+			// free access to poll
+			return $this->returnPollData( $poll, $serializer );
+		}
+
+	}
+
+	/**
+	 * get a poll config by its custom URL, we do not want polls to be reachable by their numeric id
+	 * @Get(
+	 *     path = "/{id}/pass/{md5}",
+	 *     name = "get_protected_poll",
+	 *     requirements = {"id"="\w+"}
+	 * )
+	 *
+	 * @param SerializerInterface $serializer
+	 * @param Request $request
+	 *
+	 * @return JsonResponse|Response
+	 */
+	function getProtectedPoll($id,$md5, SerializerInterface $serializer){
+		$repository = $this->getDoctrine()->getRepository( Poll::class );
+		$poll       = $repository->findOneByCustomUrl( $id );
+
+		if ( ! $poll ) {
+			return $this->notFoundPoll($id);
+		}
+
+		if (  $poll->getPassword() === $md5 ) {
+			// good matching pass
+			return $this->returnPollData( $poll, $serializer );
+		} else {
+			// wrong pass
+			return $this->json( [
+				'message' => 'this is protected by a password, your password "' . $md5 . '" is wrong, and you should feel bad',
+				'md5' => md5($md5),
 				'data'    => null,
 			],
 				403 );
-		} else {
-			$jsonResponse = $serializer->serialize( $returnedPoll, 'json' );
-
-			$response = new Response( $jsonResponse );
-			$response->headers->set( 'Content-Type', 'application/json' );
-			$response->setStatusCode( 200 );
-
-			return $response;
 		}
 
+
+	}
+
+	function returnPollData( $poll, $serializer ) {
+		$jsonResponse = $serializer->serialize( $poll, 'json' );
+
+		$response = new Response( $jsonResponse );
+		$response->headers->set( 'Content-Type', 'application/json' );
+		$response->setStatusCode( 200 );
+
+		return $response;
 	}
 
 	/**
@@ -351,7 +411,7 @@ class PollController extends FramadateController {
 		return $this->json( [
 			'message' => ' yes this slug is available on this Framadate instance ',
 			'data'    => [
-				'slug' => $customUrl,
+				'slug' => $slug,
 			],
 		],
 			404 );

src/DataFixtures/AppPollFixtures.php

@@ -37,9 +37,11 @@ class AppPollFixtures extends Fixture {
 
 		$poll = new Poll();
 		$poll->setTitle( 'citron ou orange' )
+			->setCustomUrl('citron')
 		     ->setDescription( 'votre sorbert préféré' )
 		     ->setAdminKey( uniqid() )
-		     ->setModificationPolicy( 'nobody' );
+		     ->setModificationPolicy( 'nobody' )
+		->setPassword('le pass woute woute');
 		$poll->setMailOnVote( true );
 		$poll->setOwner( $owner );
 		$owner->addPoll( $poll );
@@ -107,8 +109,9 @@ class AppPollFixtures extends Fixture {
 		$poll->addComment( $someoneComment );
 
 
-		$poll->setTitle( 'démo sondage de texte avec deux commentaires' );
+		$poll->setTitle( 'démo sondage de texte avec deux commentaires' )
-		$poll->setDescription( 'description du sondage 2' );
+		->setCustomUrl('demo')
+		->setDescription( 'description du sondage 2' );
 
 		$poll->setAdminKey( uniqid() );
 		$poll->setModificationPolicy( 'self' );
@@ -137,6 +140,7 @@ class AppPollFixtures extends Fixture {
 		$choice3->setName( $poll->addDaysToDate( $firstDate, 2 )->format( 'Y-m-d H:i:s' ) );
 
 		$poll->setTitle( "c'est pour aujourdhui ou pour demain" )
+			->setCustomUrl('aujourdhui-ou-demain')
 		     ->setDescription( 'Vous avez le choix dans la date' )
 		     ->setKind( 'date' )
 		     ->setOwner( $owner )
@@ -149,6 +153,7 @@ class AppPollFixtures extends Fixture {
 		// poll with cartoon choices
 		$poll = new Poll();
 		$poll->setTitle( 'dessin animé préféré' )
+			->setCustomUrl('dessin-anime')
 		     ->setDescription( 'choisissez votre animé préféré' )
 		     ->setOwner( $owner )
 		     ->setModificationPolicy( 'self' )