Merge pull request #24 from lingoda/10-avoid-sending-zero-content-id-…

…in-soem-exercise-types

10 - (bugfix) Avoid inserting in ContentUserData without contentId

Controller/H5PInteractionController.php

@@ -53,19 +53,18 @@ public function setFinished(Request $request, $token)
      */
     public function contentUserData(Request $request, $contentId, $dataType, $subContentId)
     {
-        $response = [
-            'success' => TRUE
-        ];
+        if (!$contentId) {
+            return new JsonResponse(['success' => false, 'message' => 'No content']);
+        }
+
         $user = $this->getUser();
         $data = $request->get("data");
         $preload = $request->get("preload");
         $invalidate = $request->get("invalidate");
         $em = $this->getDoctrine()->getManager();
         if ($data !== NULL && $preload !== NULL && $invalidate !== NULL) {
             if(!\H5PCore::validToken('contentuserdata', $request->get("token"))){
-                $response->success = FALSE;
-                $response->message = 'Invalid security token.';
-                return new JsonResponse($response);
+                return new JsonResponse(['success' => false, 'message' => 'No content']);
             }
             //remove data if data = 0
             if ($data === '0'){
@@ -119,7 +118,8 @@ public function contentUserData(Request $request, $contentId, $dataType, $subCon
                     $em->flush();
                 }
             }
-            return new JsonResponse($response);
+
+            return new JsonResponse(['success' => true]);
         }else{
             $data = $em->getRepository("StuditH5PBundle:ContentUserData")->findOneBy(
                 [
@@ -129,11 +129,13 @@ public function contentUserData(Request $request, $contentId, $dataType, $subCon
                     'user' => $user->getId()
                 ]
             );
-            //decode for read the informations
-            $response['data'] = json_decode($this->get('serializer')->serialize($data,'json'));
-        }
-        return new JsonResponse($response);
 
+            //decode for read the information
+            return new JsonResponse([
+                'success' => true,
+                'data' => json_decode($this->get('serializer')->serialize($data, 'json')),
+            ]);
+        }
     }
     /**
      * @Route("/embed/{content}")