feat(theming): allow to disable standalone windowsbackport/50666/stable30

Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>

Signed-off-by: Simon L. <szaimen@e.mail.de>

Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>

3 files changed, 24 insertions, 3 deletions

diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 5b83d3bdb8b..f26d2188c5e 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -474,7 +474,7 @@ class ThemingController extends Controller {
 						'sizes' => '16x16'
 					]
 				],
-			'display' => 'standalone'
+			'display' => $this->config->getSystemValueBool('theming.standalone_window.enabled', true) ? 'standalone' : 'browser'
 		];
 		$response = new JSONResponse($responseJS);
 		$response->cacheFor(3600);
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 629bc570032..f0c5ed744ea 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -705,7 +705,15 @@ class ThemingControllerTest extends TestCase {
 		@$this->assertEquals($expected, $this->themingController->getImage('background'));
 	}
 
-	public function testGetManifest() {
+	public static function dataGetManifest(): array {
+		return [
+			[true],
+			[false],
+		];
+	}
+
+	/** @dataProvider dataGetManifest */
+	public function testGetManifest(bool $standalone) {
 		$this->config
 			->expects($this->once())
 			->method('getAppValue')
@@ -729,6 +737,11 @@ class ThemingControllerTest extends TestCase {
 				'touchicon',
 				'favicon',
 			);
+		$this->config
+			->expects($this->once())
+			->method('getSystemValueBool')
+			->with('theming.standalone_window.enabled', true)
+			->willReturn($standalone);
 		$response = new Http\JSONResponse([
 			'name' => 'Nextcloud',
 			'start_url' => 'localhost',
@@ -745,7 +758,7 @@ class ThemingControllerTest extends TestCase {
 						'sizes' => '16x16'
 					]
 				],
-			'display' => 'standalone',
+			'display' => $standalone ? 'standalone' : 'browser',
 			'short_name' => 'Nextcloud',
 			'theme_color' => null,
 			'background_color' => null,
diff --git a/config/config.sample.php b/config/config.sample.php
index ac03cec50aa..aaf3dba2809 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -2079,6 +2079,14 @@ $CONFIG = [
  */
 'enforce_theme' => '',
 
+
+/**
+ * This setting allows to disable the PWA functionality that allows browsers to open web applications in dedicated windows.
+ *
+ * Defaults to ``true``
+ */
+'theming.standalone_window.enabled' => true,
+
 /**
  * The default cipher for encrypting files. Currently supported are:
  *  - AES-256-CTR