Merge pull request #9 from Catrobat/develop

Release Merge commit

Author: m-herold

.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.3
+4.3.1

Api/ApiServer.php

@@ -16,7 +16,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

Api/AuthenticationApiInterface.php

@@ -15,7 +15,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

Api/MediaLibraryApiInterface.php

@@ -15,7 +15,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

Api/ProjectsApiInterface.php

@@ -15,7 +15,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

Api/UserApiInterface.php

@@ -15,7 +15,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

Api/UtilityApiInterface.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * UtilityApiInterface
+ * PHP version 5.
+ *
+ * @category Class
+ *
+ * @author   OpenAPI Generator team
+ *
+ * @see     https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ * Catroweb API.
+ *
+ * API for the Catrobat Share Platform
+ *
+ * The version of the OpenAPI document: v1.0.40
+ * Contact: webmaster@catrobat.org
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Server\Api;
+
+/**
+ * UtilityApiInterface Interface Doc Comment.
+ *
+ * @category Interface
+ *
+ * @author   OpenAPI Generator team
+ *
+ * @see     https://github.com/openapitools/openapi-generator
+ */
+interface UtilityApiInterface
+{
+  /**
+   * Operation healthGet.
+   *
+   * Health Check
+   *
+   * @param int   $responseCode    The HTTP response code to return
+   * @param array $responseHeaders Additional HTTP headers to return with the response ()
+   */
+  public function healthGet(&$responseCode, array &$responseHeaders);
+}

Controller/AuthenticationController.php

@@ -16,7 +16,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -126,8 +126,7 @@ public function authenticationPostAction(Request $request)
   {
     // Make sure that the client is providing something that we can consume
     $consumes = ['application/json'];
-    $inputFormat = $request->headers->has('Content-Type') ? $request->headers->get('Content-Type') : $consumes[0];
-    if (!in_array($inputFormat, $consumes, true))
+    if (!static::isContentTypeAllowed($request, $consumes))
     {
       // We can't consume the content that the client is sending us
       return new Response('', 415);
@@ -156,6 +155,7 @@ public function authenticationPostAction(Request $request)
     // Deserialize the input values that needs it
     try
     {
+      $inputFormat = $request->getMimeType($request->getContentType());
       $login = $this->deserialize($login, 'OpenAPI\Server\Model\Login', $inputFormat);
     }
     catch (SerializerRuntimeException $exception)

Controller/Controller.php

@@ -16,7 +16,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -32,6 +32,7 @@
 use OpenAPI\Server\Service\SerializerInterface;
 use OpenAPI\Server\Service\ValidatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -97,6 +98,47 @@ public function createErrorResponse(HttpException $exception)
     return new Response(json_encode($json, 15, 512), $statusCode, $headers);
   }
 
+  /**
+   * Checks whether Content-Type request header presented in supported formats.
+   *
+   * @param Request $request  request instance
+   * @param array   $consumes array of supported content types
+   *
+   * @return bool returns true if Content-Type supported otherwise false
+   */
+  public static function isContentTypeAllowed(Request $request, array $consumes = [])
+  {
+    if (!empty($consumes) && '*/*' !== $consumes[0])
+    {
+      $currentFormat = $request->getContentType();
+      foreach ($consumes as $mimeType)
+      {
+        // canonize mime type
+        if (is_string($mimeType) && false !== $pos = strpos($mimeType, ';'))
+        {
+          $mimeType = trim(substr($mimeType, 0, $pos));
+        }
+
+        if (!$format = $request->getFormat($mimeType))
+        {
+          // add custom format to request
+          $format = $mimeType;
+          $request->setFormat($format, $format);
+          $currentFormat = $request->getContentType();
+        }
+
+        if ($format === $currentFormat)
+        {
+          return true;
+        }
+      }
+
+      return false;
+    }
+
+    return true;
+  }
+
   /**
    * Serializes data to a given type format.
    *

Controller/MediaLibraryController.php

@@ -16,7 +16,7 @@
  *
  * API for the Catrobat Share Platform
  *
- * The version of the OpenAPI document: v1.0.39
+ * The version of the OpenAPI document: v1.0.40
  * Contact: webmaster@catrobat.org
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -117,6 +117,9 @@ public function mediaFileIdGetAction(Request $request, $id)
                 case 400:
                     $message = 'BAD Request - invalid or missing required parameters';
                     break;
+                case 404:
+                    $message = 'Not Found';
+                    break;
                 case 406:
                     $message = 'Not Acceptable - client must accept application/json as content type';
                     break;