WIP: Make show forms to all users in sidebar an admin setting

lib/Constants.php

@@ -30,11 +30,13 @@ class Constants {
 	 * Used AppConfig Keys
 	 */
 	public const CONFIG_KEY_ALLOWPERMITALL = 'allowPermitAll';
+	public const CONFIG_KEY_ALLOWSHOWTOALL = 'allowShowToAll';
 	public const CONFIG_KEY_ALLOWPUBLICLINK = 'allowPublicLink';
 	public const CONFIG_KEY_CREATIONALLOWEDGROUPS = 'creationAllowedGroups';
 	public const CONFIG_KEY_RESTRICTCREATION = 'restrictCreation';
 	public const CONFIG_KEYS = [
 		self::CONFIG_KEY_ALLOWPERMITALL,
+		self::CONFIG_KEY_ALLOWSHOWTOALL,
 		self::CONFIG_KEY_ALLOWPUBLICLINK,
 		self::CONFIG_KEY_CREATIONALLOWEDGROUPS,
 		self::CONFIG_KEY_RESTRICTCREATION

lib/Service/ConfigService.php

@@ -69,6 +69,9 @@ public function __construct(string $appName,
 	public function getAllowPermitAll(): bool {
 		return json_decode($this->config->getAppValue($this->appName, Constants::CONFIG_KEY_ALLOWPERMITALL, "true"));
 	}
+	public function getAllowShowToAll() : bool {
+		return json_decode($this->config->getAppValue($this->appName, Constants::CONFIG_KEY_ALLOWSHOWTOALL, "true"));
+	}
 	public function getAllowPublicLink(): bool {
 		return json_decode($this->config->getAppValue($this->appName, Constants::CONFIG_KEY_ALLOWPUBLICLINK, "true"));
 	}
@@ -88,6 +91,7 @@ public function getRestrictCreation(): bool {
 	public function getAppConfig(): array {
 		return [
 			Constants::CONFIG_KEY_ALLOWPERMITALL => $this->getAllowPermitAll(),
+			Constants::CONFIG_KEY_ALLOWSHOWTOALL => $this->getAllowShowToAll(),
 			Constants::CONFIG_KEY_ALLOWPUBLICLINK => $this->getAllowPublicLink(),
 			Constants::CONFIG_KEY_CREATIONALLOWEDGROUPS => $this->getCreationAllowedGroups(),
 			Constants::CONFIG_KEY_RESTRICTCREATION => $this->getRestrictCreation(),

lib/Service/FormsService.php

@@ -387,7 +387,8 @@ public function isSharedFormShown(Form $form): bool {
 		// Shown if permitall and showntoall are both set.
 		if ($access['permitAllUsers'] &&
 			$access['showToAllUsers'] &&
-			$this->configService->getAllowPermitAll()) {
+			$this->configService->getAllowPermitAll() &&
+			$this->configService->getAllowShowToAll()) {
 			return true;
 		}
 

src/FormsSettings.vue

@@ -52,6 +52,12 @@
 				@update:checked="onAllowPermitAllChange">
 				{{ t('forms', 'Allow sharing to all logged in accounts') }}
 			</NcCheckboxRadioSwitch>
+			<NcCheckboxRadioSwitch ref="switchAllowShowToAll"
+				:checked.sync="appConfig.allowShowToAll"
+				type="switch"
+				@update:checked="onAllowShowToAllChange">
+				{{ t('forms', 'Allow showing form to all logged in accounts on sidebar') }}
+			</NcCheckboxRadioSwitch>
 		</NcSettingsSection>
 	</div>
 </template>
@@ -117,7 +123,12 @@ export default {
 			await this.saveAppConfig('allowPermitAll', newVal)
 			el.loading = false
 		},
-
+		async onAllowShowToAllChange(newVal) {
+			const el = this.$refs.switchAllowShowToAll
+			el.loading = true
+			await this.saveAppConfig('allowShowToAll', newVal)
+			el.loading = false
+		},
 		/**
 		 * Save a key-value pair to the appConfig.
 		 *

src/components/SidebarTabs/SharingSidebarTab.vue

@@ -133,7 +133,7 @@
 					type="switch"
 					@update:checked="onPermitAllUsersChange" />
 			</div>
-			<div v-if="form.access.permitAllUsers" class="share-div share-div--indent">
+			<div v-if="appConfig.allowShowToAll && form.access.permitAllUsers" class="share-div share-div--indent">
 				<div class="share-div__avatar">
 					<FormsIcon :size="16" />
 				</div>

tests/Unit/Controller/ConfigControllerTest.php

@@ -77,7 +77,7 @@ public function testGetAppConfig() {
 				'allow' => 'someConfig',
 				'permit' => 'all'
 			]);
-		
+
 		$this->assertEquals(new DataResponse([
 			'allow' => 'someConfig',
 			'permit' => 'all'
@@ -91,6 +91,11 @@ public function dataUpdateAppConfig() {
 				'configValue' => true,
 				'strConfig' => "true"
 			],
+			'booleanConfig' => [
+				'configKey' => 'allowShowToAll',
+				'configValue' => true,
+				'strConfig' => "true"
+			],
 			'arrayConfig' => [
 				'configKey' => 'allowPermitAll',
 				'configValue' => [
@@ -111,7 +116,7 @@ public function dataUpdateAppConfig() {
 	public function testUpdateAppConfig(string $configKey, $configValue, string $strConfig) {
 		$this->logger->expects($this->once())
 			->method('debug');
-		
+
 		$this->config->expects($this->once())
 			->method('setAppValue')
 			->with('forms', $configKey, $strConfig);
@@ -122,7 +127,7 @@ public function testUpdateAppConfig(string $configKey, $configValue, string $str
 	public function testUpdateAppConfig_unknownKey() {
 		$this->logger->expects($this->once())
 			->method('debug');
-		
+
 		$this->config->expects($this->never())
 			->method('setAppValue');
 

tests/Unit/Service/ConfigServiceTest.php

@@ -84,6 +84,7 @@ public function dataGetAppConfig() {
 			'oneFullConfig' => [
 				'strConfig' => [
 					'allowPermitAll' => 'false',
+					'allowShowToAll' => 'false',
 					'allowPublicLink' => 'false',
 					'creationAllowedGroups' => '["group1", "group2", "nonExisting"]',
 					'restrictCreation' => 'true',
@@ -94,6 +95,7 @@ public function dataGetAppConfig() {
 				],
 				'expected' => [
 					'allowPermitAll' => false,
+					'allowShowToAll' => false,
 					'allowPublicLink' => false,
 					'creationAllowedGroups' => [
 						[
@@ -156,6 +158,7 @@ public function dataGetAppConfig_Default() {
 			'defaultValues' => [
 				'expected' => [
 					'allowPermitAll' => true,
+					'allowShowToAll' => true,
 					'allowPublicLink' => true,
 					'creationAllowedGroups' => [],
 					'restrictCreation' => false,
@@ -223,7 +226,7 @@ public function testCanCreateForms(array $config, bool $expected) {
 			->method('getUserGroupIds')
 			->with($this->currentUser)
 			->willReturn(["usersGroup"]);
-		
+
 		$this->assertEquals($expected, $this->configService->canCreateForms());
 	}
 }

tests/Unit/Service/FormsServiceTest.php

@@ -1104,6 +1104,10 @@ public function testIsSharedFormShown(string $ownerId, int $expires, array $acce
 			->method('getAllowPermitAll')
 			->willReturn(true);
 
+		$this->configService->expects($this->any())
+			->method('getAllowShowToAll')
+			->willReturn(true);
+
 		$share = new Share();
 		$share->setShareType($shareType);
 		$share->setShareWith('currentUser'); // Only relevant, if $shareType is TYPE_USER, otherwise it's just some 'hash'
@@ -1129,6 +1133,36 @@ public function testIsSharedFormShown_PermitAllNotAllowed() {
 			->method('getAllowPermitAll')
 			->willReturn(false);
 
+		$this->configService->expects($this->any())
+			->method('getAllowShowToAll')
+			->willReturn(false);
+
+		$this->shareMapper->expects($this->any())
+			->method('findByForm')
+			->with(42)
+			->willReturn([]);
+
+		$this->assertEquals(false, $this->formsService->isSharedFormShown($form));
+	}
+
+	public function testIsSharedFormShown_PermitShowNotAllowed() {
+		$form = new Form();
+		$form->setId(42);
+		$form->setOwnerId('notCurrentUser');
+		$form->setExpires(false);
+		$form->setAccess([
+			'permitAllUsers' => true,
+			'showToAllUsers' => true,
+		]);
+
+		$this->configService->expects($this->any())
+			->method('getAllowPermitAll')
+			->willReturn(true);
+
+		$this->configService->expects($this->any())
+			->method('getAllowShowToAll')
+			->willReturn(false);
+
 		$this->shareMapper->expects($this->any())
 			->method('findByForm')
 			->with(42)