feat: add host url to curl calls (#170)

Author: mahiarirani

.php-cs-fixer.dist.php

@@ -30,6 +30,8 @@ public function getRules(array $rules = []): array
 	->ignoreVCSIgnored(true)
 	->notPath('dev-environment')
 	->notPath('build')
+	->notPath('css')
+	->notPath('js')
 	->notPath('l10n')
 	->notPath('src')
 	->notPath('vendor')

docker-compose.yml

@@ -106,6 +106,7 @@ services:
       - backend
 
   rsync:
+    profiles: [ development ]
     build:
       context: ./docker/rsync
       dockerfile: Dockerfile
@@ -123,8 +124,7 @@ services:
       - backend
 
   adminer:
-    profiles:
-      - development
+    profiles: [ development ]
     # visit https://adminer.hejbit.local/?pgsql=postgres&username=swarmbox&db=swarmbox
     image: adminer:latest
     restart: unless-stopped
@@ -145,8 +145,7 @@ services:
       ADMINER_DEFAULT_SERVER: postgres
 
   flagd:
-    profiles:
-      - feature
+    profiles: [ feature ]
     image: ghcr.io/open-feature/flagd:latest
     restart: unless-stopped
     command: 'start --uri file:/etc/flagd/hejbit.flagd.json --cors-origin *'
@@ -164,8 +163,7 @@ services:
         condition: service_healthy
 
   onlyoffice:
-    profiles:
-      - onlyoffice
+    profiles: [ onlyoffice ]
     image: onlyoffice/documentserver
     environment:
       JWT_ENABLED: true

lib/Contract/Enum/ApiEndpoints.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\Files_External_Ethswarm\Contract\Enum;
+
+enum ApiEndpoints: string {
+	case DOWNLOAD = '/api/download';
+	case UPLOAD = '/api/upload';
+	case READINESS = '/api/readiness';
+}

lib/Storage/BeeSwarmTrait.php

@@ -24,6 +24,7 @@
 use CURLFile;
 use OCA\Files_External_Ethswarm\Auth\AccessKey;
 use OCA\Files_External_Ethswarm\Backend\BeeSwarm;
+use OCA\Files_External_Ethswarm\Contract\Enum\ApiEndpoints;
 use OCA\Files_External_Ethswarm\Dto\LinkDto;
 use OCA\Files_External_Ethswarm\Exception\CurlException;
 use OCA\Files_External_Ethswarm\Exception\HejBitException;
@@ -80,8 +81,8 @@ private function validateParams(array &$params): void {
 	/**
 	 * @throws CurlException|HejBitException
 	 */
-	private function getLink(string $endpoint): LinkDto {
-		$endpoint = $this->api_url.$endpoint;
+	private function getLink(ApiEndpoints $endpoint): LinkDto {
+		$endpoint = $this->api_url.$endpoint->value;
 		$request = new Curl($endpoint, headers: [
 			'accept: application/json',
 		], authorization: $this->access_key);
@@ -102,7 +103,7 @@ private function uploadSwarm(string $path, string $tempFile, string $mimetype):
 			return $this->uploadSwarmV1($path, $tempFile, $mimetype);
 		}
 
-		$link = $this->getLink('/api/upload');
+		$link = $this->getLink(ApiEndpoints::UPLOAD);
 		$request = new Curl($link->url, authorization: $link->token);
 		$response = $request->post([
 			'file' => new CURLFile($tempFile, $mimetype, basename($path)),
@@ -126,7 +127,7 @@ private function downloadSwarm(string $reference) {
 			return $this->downloadSwarmV1($reference);
 		}
 
-		$link = $this->getLink('/api/download');
+		$link = $this->getLink(ApiEndpoints::DOWNLOAD);
 		$request = new Curl($link->url."/{$reference}", authorization: $link->token);
 		$response = $request->get();
 
@@ -151,7 +152,7 @@ private function checkConnection(): bool {
 			return $this->checkConnectionV1();
 		}
 
-		$endpoint = $this->api_url.'/api/readiness';
+		$endpoint = $this->api_url.ApiEndpoints::READINESS->value;
 
 		$request = new Curl($endpoint, authorization: $this->access_key);
 		$request->get();

lib/Utils/Curl.php

@@ -130,6 +130,7 @@ private function setOptions(array $options = []): void {
 
 	private function setHeaders(array $headers = []): void {
 		$headers = $this->headers + $headers;
+		$headers[] = 'X-NextCloud-Host: '.$_SERVER['HTTP_HOST'];
 		if ($this->authorization) {
 			$headers[] = match ($this->authorizationType) {
 				CURLAUTH_BEARER => 'Authorization: Bearer '.$this->authorization,

package.json

@@ -24,8 +24,8 @@
 		"lint:fix": "biome lint --write src styles",
 		"format": "biome format .",
 		"format:fix": "biome format --write .",
-		"backend:format": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run",
-		"backend:format:fix": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix",
+		"backend:format": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --dry-run",
+		"backend:format:fix": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --path-mode=intersection --using-cache=no",
 		"typecheck": "vue-tsc --noEmit"
 	},
 	"dependencies": {