Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/response-headers
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikBohucak authored Oct 1, 2023
2 parents 4e21085 + b6ab3d4 commit d81453f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion application/public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function callAtlassian(
return new \GuzzleHttp\Psr7\Response(
$response->getStatusCode(),
$headers,
$response->getBody()
$response->getBody()->getContents()
);
} catch (\Exception $e) {
return new \GuzzleHttp\Psr7\Response(
Expand All @@ -78,6 +78,7 @@ function callAtlassian(
$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) {
Expand Down
1 change: 1 addition & 0 deletions application/src/Service/AtlassianApiService.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public function addIssueAttachments(string $issueId, array $files): ResponseInte
"public" => true,
"temporaryAttachmentIds" => $files
];

return $this->client->post('servicedeskapi/request/'.$issueId.'/attachment', [
RequestOptions::HEADERS => [
'Accept' => 'application/json',
Expand Down

0 comments on commit d81453f

Please sign in to comment.