Merge pull request #7 from slovensko-digital/bugfix/response-headers

fix configuration attlasian + fix cross headers
slovensko-digital · Oct 1, 2023 · 4c24248 · 4c24248
2 parents daaa739 + 43e1635
commit 4c24248
Show file tree

Hide file tree

Showing 12 changed files with 308 additions and 126 deletions.
diff --git a/application/public/index.php b/application/public/index.php
@@ -13,6 +13,10 @@
 
 $app = AppFactory::create();
 
+
+// Add Error Handling Middleware
+//$app->addErrorMiddleware(true, true, false);
+
 function procesJsonRequest($request): Request
 {
     $contentType = $request->getHeaderLine('Content-Type');
@@ -26,21 +30,43 @@ function procesJsonRequest($request): Request
     return $request;
 }
 
-function callAtlassian(HandlerInterface $handler, Request $request, Response $response): Response
-{
-    $headers = [
-        'Content-Type' => 'application/json',
-        'Accept' => 'application/json',
-        'Access-Control-Allow-Origin' =>  '*',
-    ];
+function callAtlassian(
+    HandlerInterface $handler,
+    Request $request,
+    Response $response,
+    bool $isOption = false,
+    string $accept = 'application/json',
+    string $contentType = 'application/json'
+): Response {
+    $headers = [];
+    $headers["Access-Control-Allow-Origin"] = "*";
+    $headers['Access-Control-Allow-Methods'] = "*";
+    $headers['Access-Control-Allow-Headers'] = 'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,Recaptcha-Token,Recaptcha-Action';
+    $headers['Access-Control-Allow-Credentials'] = "true";
+    $headers['Access-Control-Max-Age'] = 86400;
+    $headers['Content-Type'] = $contentType;
+    $headers['Accept'] = $accept;
+
+    if ($isOption) {
+        return new \GuzzleHttp\Psr7\Response(200, $headers, json_encode([]));
+    }
+
     try {
-        $request = procesJsonRequest($request);
-        return $handler->handle($request);
+        $response = $handler->handle($request);
+        return new \GuzzleHttp\Psr7\Response(
+            $response->getStatusCode(),
+            $headers,
+            $response->getBody()
+        );
     } catch (\Exception $e) {
-        $response = $response->withStatus(500);
-        $response->getBody()->write($e->getMessage());
+        return new \GuzzleHttp\Psr7\Response(
+            500,
+            $headers,
+            json_encode([
+                'error' => $e->getMessage()
+            ])
+        );
     }
-    return $response;
 }
 
 $app->get('/test/ping', function (Request $request, Response $response, $args) {
@@ -49,30 +75,40 @@ function callAtlassian(HandlerInterface $handler, Request $request, Response $re
     return $response;
 });
 
-$app->get('/test/auth', function (Request $request, Response $response, $args) {
+$app->post('/test/auth', function (Request $request, Response $response, $args) {
     $handler = new TestAuthHandler();
-    return callAtlassian($handler, $request, $response);
+    return $handler->handle($request);
+});
+
+$app->options('/test/auth', function (Request $request, Response $response, $args) {
+    $handler = new TestAuthHandler();
+    return $handler->handle($request);
 });
 
 $app->get('/issue/search', function (Request $request, Response $response, $args) {
     $handler = new GetIssueSearchHandler();
+    $request = procesJsonRequest($request);
     return callAtlassian($handler, $request, $response);
 });
 
 $app->post('/issue/idea', function (Request $request, Response $response, $args) {
     $handler = new SendIdeaHandler();
-    return callAtlassian($handler, $request, $response);
+    return callAtlassian($handler, $request, $response, false, 'multipart/form-data');
+});
+
+$app->options('/issue/idea', function (Request $request, Response $response, $args) {
+    $handler = new SendIdeaHandler();
+    return callAtlassian($handler, $request, $response, true, 'multipart/form-data');
 });
 
 $app->post('/issue/problem', function (Request $request, Response $response, $args) {
     $handler = new SendProblemHandler();
-    return callAtlassian($handler, $request, $response);
+    return callAtlassian($handler, $request, $response, false,  'multipart/form-data');
 });
 
-$app->get('/issue', function (Request $request, Response $response, $args) {
-    $request = procesJsonRequest($request);
-    $response->getBody()->write("Hello world!");
-    return $response;
+$app->options('/issue/problem', function (Request $request, Response $response, $args) {
+    $handler = new SendProblemHandler();
+    return callAtlassian($handler, $request, $response, true,  'multipart/form-data');
 });
 
 $app->run();
diff --git a/application/src/Handler/AbstractHandler.php b/application/src/Handler/AbstractHandler.php
@@ -4,43 +4,61 @@
 
 namespace App\Handler;
 
+use App\Service\AtlassianApiService;
+use App\Traits\RecaptchaTrait;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\UploadedFile;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class AbstractHandler implements HandlerInterface
 {
-    protected function validRecaptcha(?string $token, ?string $action) {
-        $secretKey = getenv('recaptcha_secret');
-
-        if (isset($_POST['email']) && $_POST['email']) {
-            $email = filter_var($_POST['email'], FILTER_SANITIZE_STRING);
-        } else {
-            // set error message and redirect back to form...
-            header('location: subscribe_newsletter_form.php');
-            exit;
-        }
+    use RecaptchaTrait;
+    protected AtlassianApiService $atlassianApi;
 
-        // call curl to POST request
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL,"https://www.google.com/recaptcha/api/siteverify");
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array('secret' => $secretKey, 'response' => $token)));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($ch);
-        curl_close($ch);
-        $arrResponse = json_decode($response, true);
-
-        // verify the response
-        if($arrResponse["success"] == '1' && $arrResponse["action"] == $action && $arrResponse["score"] >= 0.5) {
-            return true;
-        } else {
-            return false;
-        }
+    public function __construct()
+    {
+        $this->atlassianApi = new AtlassianApiService();
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         return new Response();
     }
-}
+
+    protected function getApiResponseHeaders(): array
+    {
+        $headers = [];
+
+        $headers["Access-Control-Allow-Origin"] = "*";
+        $headers['Access-Control-Allow-Methods'] = "*";
+        $headers['Access-Control-Allow-Headers'] = 'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,Recaptcha-Token,Recaptcha-Action';
+        $headers['Access-Control-Allow-Credentials'] = "true";
+        $headers['Access-Control-Max-Age'] = 86400;
+        $headers['Content-Type'] = 'application/json';
+        $headers['Accept'] = 'application/json';
+        return $headers;
+    }
+
+    public function getFilesFromRequest(ServerRequestInterface $request): array
+    {
+        $uploadedFiles = $request->getUploadedFiles();
+        $files = [];
+
+        /**
+         * @var UploadedFile $image
+         */
+        foreach ($uploadedFiles as $image) {
+
+            if ($image->getError() === UPLOAD_ERR_OK) {
+                $file = [
+                    "name" => 'file',
+                    "contents" => (string)$image->getStream(),
+                    'filename' => $image->getClientFilename(),
+                ];
+                $files[] = $file;
+            }
+        }
+        return $files;
+    }
+}
diff --git a/application/src/Handler/GetIssueSearchHandler.php b/application/src/Handler/GetIssueSearchHandler.php
@@ -4,20 +4,12 @@
 
 namespace App\Handler;
 
-use App\Service\AtlassianApiService;
 use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class GetIssueSearchHandler extends AbstractHandler
 {
-    private AtlassianApiService $atlassianApi;
-
-    public function __construct()
-    {
-        $this->atlassianApi = new AtlassianApiService();
-    }
-
     /**
      * @throws GuzzleException
      */

diff --git a/application/src/Handler/IssueHandler.php b/application/src/Handler/IssueHandler.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Handler;
+
+use App\Model\AtlassianIdeaModel;
+use App\Service\AtlassianApiService;
+use Exception;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\UploadedFile;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class IssueHandler extends AbstractHandler
+{
+    private string $issueClassName = AtlassianIdeaModel::class;
+
+    public function getFilesFromRequest(ServerRequestInterface $request): array
+    {
+        $uploadedFiles = $request->getUploadedFiles();
+        $files = [];
+
+        /**
+         * @var UploadedFile $image
+         */
+        foreach ($uploadedFiles as $image) {
+
+            if ($image->getError() === UPLOAD_ERR_OK) {
+                $file = [
+                    "name" => 'file',
+                    "contents" => (string)$image->getStream(),
+                    'filename' => $image->getClientFilename(),
+                ];
+                $files[] = $file;
+            }
+        }
+        return $files;
+    }
+
+    public function addIssueAttachments(array $files, string $issueId): ?ResponseInterface
+    {
+        if (empty($files)) return null;
+        /* @var AtlassianApiService $attlasianApi */
+        $tempResponse = $this->atlassianApi->CreateAttachment($files);
+        $tempResponseData = json_decode($tempResponse->getBody()->getContents(), true);
+        $attachmentIds = [];
+        foreach ($tempResponseData['temporaryAttachments'] ?? [] as $attachment) {
+            $attachmentIds[] = $attachment['temporaryAttachmentId'];
+        }
+        return $this->atlassianApi->addIssueAttachments($issueId, $attachmentIds);
+    }
+
+
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        $data = $request->getParsedBody();
+        $token = $request->getHeader('Recaptcha-Token')[0] ?? null;
+        $action = $request->getHeader('Recaptcha-Action')[0] ?? null;
+
+        try {
+            if ($this->validRecaptcha($token, $action)) {
+                $issueData = new $this->issueClassName();
+                $issueData->fromArray($data);
+                $issueResponse =  $this->atlassianApi->sendIssue($issueData);
+
+                $files = $this->getFilesFromRequest($request);
+                if ($issueResponse->getStatusCode() === 201 && !empty($files)) {
+                    $issue = json_decode($issueResponse->getBody()->getContents(), true);
+                    $this->addIssueAttachments($files, $issue['issueId']);
+                }
+
+                return $issueResponse;
+            }
+        } catch (Exception | GuzzleException $e) {
+            return new Response(401, [], json_encode([$e->getMessage()]));
+        }
+
+        return new Response(401, [], json_encode(['error' => 'DATA_INVALID']));
+    }
+}
diff --git a/application/src/Handler/SendIdeaHandler.php b/application/src/Handler/SendIdeaHandler.php
@@ -5,34 +5,8 @@
 namespace App\Handler;
 
 use App\Model\AtlassianIdeaModel;
-use App\Service\AtlassianApiService;
-use Exception;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Psr7\Response;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
-final class SendIdeaHandler extends AbstractHandler
+final class SendIdeaHandler extends IssueHandler
 {
-    private AtlassianApiService $atlassianApi;
-
-    public function __construct()
-    {
-        $this->atlassianApi = new AtlassianApiService();
-    }
-
-    /**
-     * @throws GuzzleException
-     * @throws Exception
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $data = $request->getParsedBody();
-        if ($this->validRecaptcha($data['token'] ?? null, $data['action'] ?? null)) {
-            $issueData = new AtlassianIdeaModel();
-            $issueData->fromArray($data);
-            return $this->atlassianApi->sendIssue($issueData);
-        }
-        return new Response(401, [], 'DATA_INVALID');
-    }
+    private string $issueClassName = AtlassianIdeaModel::class;
 }
diff --git a/application/src/Handler/SendProblemHandler.php b/application/src/Handler/SendProblemHandler.php
@@ -5,34 +5,8 @@
 namespace App\Handler;
 
 use App\Model\AtlassianProblemModel;
-use App\Service\AtlassianApiService;
-use Exception;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Psr7\Response;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
-final class SendProblemHandler extends AbstractHandler
+final class SendProblemHandler extends IssueHandler
 {
-    private AtlassianApiService $atlassianApi;
-
-    public function __construct()
-    {
-        $this->atlassianApi = new AtlassianApiService();
-    }
-
-    /**
-     * @throws GuzzleException
-     * @throws Exception
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $data = $request->getParsedBody();
-        if ($this->validRecaptcha($data['token'] ?? null, $data['action'] ?? null)) {
-            $problemData = new AtlassianProblemModel();
-            $problemData->fromArray($data);
-            return $this->atlassianApi->sendIssue($problemData);
-        }
-        return new Response(401, [], 'DATA_INVALID');
-    }
-}
+    private string $issueClassName = AtlassianProblemModel::class;
+}