From eb4c42d3d1fda02895d35a360bceb08379f328c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 16 Jan 2020 18:42:58 +0100
Subject: [PATCH] Make auto accepting the default and provide setting to
 enforce the share acceptance process
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../lib/Listener/UserShareAcceptanceListener.php    |  5 ++++-
 apps/files_sharing/lib/Settings/Personal.php        |  7 +++++--
 .../src/components/PersonalSettings.vue             |  8 +++-----
 config/config.sample.php                            | 13 +++++++++----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php b/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
index f8ce4353c1..382f0b6179 100644
--- a/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
+++ b/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\Files_Sharing\Listener;
 
+use OCA\Files_Sharing\AppInfo\Application;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IConfig;
@@ -74,7 +75,9 @@ class UserShareAcceptanceListener implements IEventListener {
 	}
 
 	private function handleAutoAccept(IShare $share, string $userId) {
-		if ($this->config->getUserValue($userId, 'files_sharing','default_accept','no') === 'yes') {
+		$defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes';
+		$acceptDefault = $this->config->getUserValue($userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
+		if (!$this->config->getSystemValueBool('sharing.force_share_accept', false) && $acceptDefault) {
 			$this->shareManager->acceptShare($share, $userId);
 		}
 	}
diff --git a/apps/files_sharing/lib/Settings/Personal.php b/apps/files_sharing/lib/Settings/Personal.php
index 25740d8b4f..d6fd7f5f9c 100644
--- a/apps/files_sharing/lib/Settings/Personal.php
+++ b/apps/files_sharing/lib/Settings/Personal.php
@@ -48,8 +48,11 @@ class Personal implements ISettings {
 	}
 
 	public function getForm(): TemplateResponse {
-		$value = $this->config->getUserValue($this->userId, Application::APP_ID, 'default_accept', 'no') === 'yes';
-		$this->initialState->provideInitialState(Application::APP_ID, 'accept_default', $value);
+		$defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes';
+		$acceptDefault = $this->config->getUserValue($this->userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
+		$enforceAccept = $this->config->getSystemValueBool('sharing.force_share_accept', false);
+		$this->initialState->provideInitialState(Application::APP_ID, 'accept_default', $acceptDefault);
+		$this->initialState->provideInitialState(Application::APP_ID, 'enforce_accept', $enforceAccept);
 		return new TemplateResponse('files_sharing', 'Settings/personal');
 	}
 
diff --git a/apps/files_sharing/src/components/PersonalSettings.vue b/apps/files_sharing/src/components/PersonalSettings.vue
index b6cbbc180b..ec7255480e 100644
--- a/apps/files_sharing/src/components/PersonalSettings.vue
+++ b/apps/files_sharing/src/components/PersonalSettings.vue
@@ -20,7 +20,7 @@
   -->
 
 <template>
-	<div id="files-sharing-personal-settings" class="section">
+	<div id="files-sharing-personal-settings" class="section" v-if="!enforceAcceptShares">
 		<h2>{{ t('files', 'Sharing') }}</h2>
 		<p>
 			<input id="files-sharing-personal-settings-accept"
@@ -42,12 +42,10 @@ export default {
 	name: 'PersonalSettings',
 	data() {
 		return {
-			accepting: true,
+			accepting: loadState('files_sharing', 'accept_default'),
+			enforceAcceptShares: loadState('files_sharing', 'enforce_accept'),
 		}
 	},
-	mounted() {
-		this.accepting = loadState('files_sharing', 'accept_default')
-	},
 	methods: {
 		toggleEnabled() {
 			axios.put(
diff --git a/config/config.sample.php b/config/config.sample.php
index ba47fe9e84..0122199db3 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1339,11 +1339,16 @@ $CONFIG = array(
 'sharing.minSearchStringLength' => 0,
 
 /**
- * Starting with Nextcloud 18 also internal shares have to be accepted. Setting
- * this setting to true forces all internal shares to be accepted directly.
- * (resulting in pre 18 behavior).
+ * Set to true to enable that internal shares need to be accepted by the users by default.
+ * Users can change this for their account in their personal sharing settings
  */
-'sharing.interal_shares_accepted' => false,
+'sharing.enable_share_accept' => false,
+
+/**
+ * Set to true to enforce that internal shares need to be accepted
+ */
+'sharing.force_share_accept' => false,
+
 
 /**
  * All other configuration options