Merge pull request #18940 from nextcloud/force-share-accept

Make the share accept process optional

apps/files_sharing/composer/composer/autoload_classmap.php

@@ -48,7 +48,6 @@ return array(
     'OCA\\Files_Sharing\\Helper' => $baseDir . '/../lib/Helper.php',
     'OCA\\Files_Sharing\\Hooks' => $baseDir . '/../lib/Hooks.php',
     'OCA\\Files_Sharing\\ISharedStorage' => $baseDir . '/../lib/ISharedStorage.php',
-    'OCA\\Files_Sharing\\Listener\\GlobalShareAcceptanceListener' => $baseDir . '/../lib/Listener/GlobalShareAcceptanceListener.php',
     'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => $baseDir . '/../lib/Listener/LoadAdditionalListener.php',
     'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
     'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => $baseDir . '/../lib/Listener/UserShareAcceptanceListener.php',

apps/files_sharing/composer/composer/autoload_static.php

@@ -63,7 +63,6 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
         'OCA\\Files_Sharing\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
         'OCA\\Files_Sharing\\ISharedStorage' => __DIR__ . '/..' . '/../lib/ISharedStorage.php',
-        'OCA\\Files_Sharing\\Listener\\GlobalShareAcceptanceListener' => __DIR__ . '/..' . '/../lib/Listener/GlobalShareAcceptanceListener.php',
         'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php',
         'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
         'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => __DIR__ . '/..' . '/../lib/Listener/UserShareAcceptanceListener.php',

apps/files_sharing/lib/AppInfo/Application.php

@@ -214,7 +214,6 @@ class Application extends App {
 		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
 			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
 		});
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, GlobalShareAcceptanceListener::class);
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
 
 		// notifications api to accept incoming user shares

apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Files_Sharing\Listener;
-
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\IConfig;
-use OCP\Share\Events\ShareCreatedEvent;
-use OCP\Share\IManager;
-use OCP\Share\IShare;
-
-class GlobalShareAcceptanceListener implements IEventListener {
-
-	/** @var IConfig */
-	private $config;
-	/** @var IManager */
-	private $shareManager;
-
-	public function __construct(IConfig $config, IManager $shareManager) {
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof ShareCreatedEvent)) {
-			return;
-		}
-
-		if ($this->config->getSystemValueBool('sharing.interal_shares_accepted', false)) {
-			$share = $event->getShare();
-
-			if ($share->getShareType() === IShare::TYPE_USER || $share->getShareType() === IShare::TYPE_GROUP) {
-				$share->setStatus(IShare::STATUS_ACCEPTED);
-				$this->shareManager->updateShare($share);
-			}
-		}
-	}
-
-}

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);
 		}
 	}

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');
 	}
 

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(

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