adjusted how headers are passing from ExApp to client (#246)

Hope that this refactoring will not break anything :)

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>

Author: bigcat88

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.0 - 2024-03-xx]
+
+### Changed
+
+- ExAppProxy: adjusted how `headers` are passing from ExApp to client. # 
+
 ## [2.2.0 - 2024-02-21]
 
 ### Added

lib/Controller/ExAppProxyController.php

@@ -32,7 +32,15 @@ public function __construct(
 	}
 
 	private function createProxyResponse(string $path, IResponse $response, $cache = true): ProxyResponse {
+		$headersToIgnore = ['aa-version', 'ex-app-id', 'authorization-app-api', 'ex-app-version', 'aa-request-id'];
+		$responseHeaders = [];
+		foreach ($response->getHeaders() as $key => $value) {
+			if (!in_array(strtolower($key), $headersToIgnore)) {
+				$responseHeaders[$key] = $value[0];
+			}
+		}
 		$content = $response->getBody();
+
 		$isHTML = pathinfo($path, PATHINFO_EXTENSION) === 'html';
 		if ($isHTML) {
 			$nonce = $this->nonceManager->getNonce();
@@ -43,29 +51,18 @@ private function createProxyResponse(string $path, IResponse $response, $cache =
 			);
 		}
 
-		$mime = $response->getHeader('content-type');
-		if (empty($mime)) {
+		if (empty($response->getHeader('content-type'))) {
 			$mime = $this->mimeTypeHelper->detectPath($path);
 			if (pathinfo($path, PATHINFO_EXTENSION) === 'wasm') {
 				$mime = 'application/wasm';
 			}
-		}
-
-		$proxyResponse = new ProxyResponse(
-			data: $content,
-			length: strlen($content),
-			mimeType: $mime,
-		);
-
-		$headersToCopy = ['Content-Disposition', 'Last-Modified', 'Etag'];
-		foreach ($headersToCopy as $element) {
-			$headerValue = $response->getHeader($element);
-			if (empty($headerValue)) {
-				$proxyResponse->addHeader($element, $headerValue);
+			if (!empty($mime) && $mime != 'application/octet-stream') {
+				$responseHeaders['Content-Type'] = $mime;
 			}
 		}
 
-		if ($cache && !$isHTML) {
+		$proxyResponse = new ProxyResponse($response->getStatusCode(), $responseHeaders, $content);
+		if ($cache && !$isHTML && empty($response->getHeader('cache-control'))) {
 			$proxyResponse->cacheFor(3600);
 		}
 		return $proxyResponse;
@@ -75,19 +72,15 @@ private function createProxyResponse(string $path, IResponse $response, $cache =
 	#[NoCSRFRequired]
 	public function ExAppGet(string $appId, string $other): Response {
 		$exApp = $this->exAppService->getExApp($appId);
-		if ($exApp === null) {
-			return new NotFoundResponse();
-		}
-		if (!$exApp->getEnabled()) {
+		if ($exApp === null || !$exApp->getEnabled()) {
 			return new NotFoundResponse();
 		}
 
 		$response = $this->service->requestToExApp(
 			$exApp, '/' . $other, $this->userId, 'GET', request: $this->request
 		);
 		if (is_array($response)) {
-			$error_response = new Response();
-			return $error_response->setStatus(500);
+			return (new Response())->setStatus(500);
 		}
 		return $this->createProxyResponse($other, $response);
 	}
@@ -96,21 +89,16 @@ public function ExAppGet(string $appId, string $other): Response {
 	#[NoCSRFRequired]
 	public function ExAppPost(string $appId, string $other): Response {
 		$exApp = $this->exAppService->getExApp($appId);
-		if ($exApp === null) {
-			return new NotFoundResponse();
-		}
-		if (!$exApp->getEnabled()) {
+		if ($exApp === null || !$exApp->getEnabled()) {
 			return new NotFoundResponse();
 		}
 
 		$response = $this->service->aeRequestToExApp(
 			$exApp, '/' . $other, $this->userId,
-			params: $this->request->getParams(),
-			request: $this->request
+			params: $this->request->getParams(), request: $this->request
 		);
 		if (is_array($response)) {
-			$error_response = new Response();
-			return $error_response->setStatus(500);
+			return (new Response())->setStatus(500);
 		}
 		return $this->createProxyResponse($other, $response);
 	}
@@ -119,21 +107,15 @@ public function ExAppPost(string $appId, string $other): Response {
 	#[NoCSRFRequired]
 	public function ExAppPut(string $appId, string $other): Response {
 		$exApp = $this->exAppService->getExApp($appId);
-		if ($exApp === null) {
-			return new NotFoundResponse();
-		}
-		if (!$exApp->getEnabled()) {
+		if ($exApp === null || !$exApp->getEnabled()) {
 			return new NotFoundResponse();
 		}
 
 		$response = $this->service->aeRequestToExApp(
-			$exApp, '/' . $other, $this->userId, 'PUT',
-			params: $this->request->getParams(),
-			request: $this->request
+			$exApp, '/' . $other, $this->userId, 'PUT', $this->request->getParams(), request: $this->request
 		);
 		if (is_array($response)) {
-			$error_response = new Response();
-			return $error_response->setStatus(500);
+			return (new Response())->setStatus(500);
 		}
 		return $this->createProxyResponse($other, $response);
 	}
@@ -142,21 +124,15 @@ public function ExAppPut(string $appId, string $other): Response {
 	#[NoCSRFRequired]
 	public function ExAppDelete(string $appId, string $other): Response {
 		$exApp = $this->exAppService->getExApp($appId);
-		if ($exApp === null) {
-			return new NotFoundResponse();
-		}
-		if (!$exApp->getEnabled()) {
+		if ($exApp === null || !$exApp->getEnabled()) {
 			return new NotFoundResponse();
 		}
 
 		$response = $this->service->aeRequestToExApp(
-			$exApp, '/' . $other, $this->userId, 'DELETE',
-			params: $this->request->getParams(),
-			request: $this->request
+			$exApp, '/' . $other, $this->userId, 'DELETE', $this->request->getParams(), request: $this->request
 		);
 		if (is_array($response)) {
-			$error_response = new Response();
-			return $error_response->setStatus(500);
+			return (new Response())->setStatus(500);
 		}
 		return $this->createProxyResponse($other, $response);
 	}

lib/ProxyResponse.php

@@ -14,16 +14,11 @@ class ProxyResponse extends Response implements ICallbackResponse {
 	private mixed $data;
 
 	public function __construct(int $status = HttpAlias::STATUS_OK,
-		array $headers = [], mixed $data = null, int $length = 0,
-		string $mimeType = '', int $lastModified = 0) {
+		array $headers = [], mixed $data = null, int $lastModified = 0) {
 		parent::__construct();
 		$this->data = $data;
 		$this->setStatus($status);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Length', (string)$length);
-		if (!empty($mimeType)) {
-			$this->addHeader('Content-Type', $mimeType);
-		}
 		if ($lastModified !== 0) {
 			$lastModifiedDate = new \DateTime();
 			$lastModifiedDate->setTimestamp($lastModified);