force_nc_base from config file

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Service/ConfigService.php

@@ -592,16 +592,14 @@ public function isLocalInstance(string $instance): bool {
 	public function configureRequest(NC19Request $request, string $routeName = '', array $args = []) {
 		$this->configureRequestAddress($request, $routeName, $args);
 
-		if ($this->getAppValue(ConfigService::CIRCLES_SELF_SIGNED) === '1') {
-			$request->setVerifyPeer(false);
-		}
-
+		$request->setVerifyPeer($this->getAppValue(ConfigService::CIRCLES_SELF_SIGNED) !== '1');
 		$request->setLocalAddressAllowed(true);
 	}
 
 	/**
 	 * - Create route using overwrite.cli.url.
 	 * - can be forced using FORCE_NC_BASE or TEST_BC_BASE (temporary)
+	 * - can also be overwritten in config/config.php: 'circles.force_nc_base'
 	 * - perfect for loopback request.
 	 *
 	 * @param NC19Request $request
@@ -616,7 +614,7 @@ private function configureRequestAddress(NC19Request $request, string $routeName
 		}
 
 		$ncBase = ($this->getAppValue(self::TEST_NC_BASE)) ?
-			$this->getAppValue(self::TEST_NC_BASE) : $this->getAppValue(self::FORCE_NC_BASE);
+			$this->getAppValue(self::TEST_NC_BASE) : $this->getForcedNcBase();
 
 		if ($ncBase !== '') {
 			$absolute = rtrim($ncBase, '/') . $this->urlGenerator->linkToRoute($routeName, $args);
@@ -627,5 +625,20 @@ private function configureRequestAddress(NC19Request $request, string $routeName
 		$request->basedOnUrl($absolute);
 	}
 
+
+	/**
+	 * - return force_nc_base from config/config.php, then from FORCE_NC_BASE.
+	 *
+	 * @return string
+	 */
+	private function getForcedNcBase(): string {
+		$fromConfig = $this->config->getSystemValue('circles.force_nc_base', '');
+		if ($fromConfig !== '') {
+			return $fromConfig;
+		}
+
+		return $this->getAppValue(self::FORCE_NC_BASE);
+	}
+
 }