Merge pull request #29534 from nextcloud/backport/29332/stable22

nextcloud · Nov 4, 2021 · f376af6 · f376af6
2 parents 9b1eab2 + 34029fe
commit f376af6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/apps/sharebymail/lib/Capabilities.php b/apps/sharebymail/lib/Capabilities.php
@@ -27,6 +27,7 @@
  */
 namespace OCA\ShareByMail;
 
+use OCA\ShareByMail\Settings\SettingsManager;
 use OCP\Capabilities\ICapability;
 use OCP\Share\IManager;
 
@@ -35,8 +36,13 @@ class Capabilities implements ICapability {
 	/** @var IManager */
 	private $manager;
 
-	public function __construct(IManager $manager) {
+	/** @var SettingsManager */
+	private $settingsManager;
+
+	public function __construct(IManager $manager,
+								SettingsManager $settingsManager) {
 		$this->manager = $manager;
+		$this->settingsManager = $settingsManager;
 	}
 
 	public function getCapabilities(): array {
@@ -46,6 +52,7 @@ public function getCapabilities(): array {
 					'sharebymail' =>
 						[
 							'enabled' => $this->manager->shareApiAllowLinks(),
+							'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(),
 							'upload_files_drop' => [
 								'enabled' => true,
 							],

diff --git a/apps/sharebymail/tests/CapabilitiesTest.php b/apps/sharebymail/tests/CapabilitiesTest.php
@@ -26,6 +26,7 @@
 namespace OCA\ShareByMail\Tests;
 
 use OCA\ShareByMail\Capabilities;
+use OCA\ShareByMail\Settings\SettingsManager;
 use OCP\Share\IManager;
 use Test\TestCase;
 
@@ -36,12 +37,16 @@ class CapabilitiesTest extends TestCase {
 	/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
 	private $manager;
 
+	/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
+	private $settingsManager;
+
 	protected function setUp(): void {
 		parent::setUp();
 
 
 		$this->manager = $this::createMock(IManager::class);
-		$this->capabilities = new Capabilities($this->manager);
+		$this->settingsManager = $this::createMock(SettingsManager::class);
+		$this->capabilities = new Capabilities($this->manager, $this->settingsManager);
 	}
 
 	public function testGetCapabilities() {
@@ -51,13 +56,16 @@ public function testGetCapabilities() {
 			->willReturn(false);
 		$this->manager->method('shareApiLinkDefaultExpireDateEnforced')
 			->willReturn(false);
+		$this->settingsManager->method('sendPasswordByMail')
+			->willReturn(true);
 
 		$capabilities = [
 			'files_sharing' =>
 				[
 					'sharebymail' =>
 						[
 							'enabled' => true,
+							'send_password_by_mail' => true,
 							'upload_files_drop' => [
 								'enabled' => true,
 							],