upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #29332 from nextcloud/sendPasswordByMail

Browse source
This commit is contained in:
John Molakvoæ 2021-10-21 17:41:18 +02:00 committed by GitHub
commit acea728053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/sharebymail/lib/Capabilities.php
View file

@ -27,6 +27,7 @@ declare(strict_types=1);
*/
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 @@ class Capabilities implements ICapability {
'sharebymail' =>
[
'enabled' => $this->manager->shareApiAllowLinks(),
'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(),
'upload_files_drop' => [
'enabled' => true,
],

10
apps/sharebymail/tests/CapabilitiesTest.php
View file

@ -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,6 +56,8 @@ class CapabilitiesTest extends TestCase {
->willReturn(false);
$this->manager->method('shareApiLinkDefaultExpireDateEnforced')
->willReturn(false);
$this->settingsManager->method('sendPasswordByMail')
->willReturn(true);
$capabilities = [
'files_sharing' =>
@ -58,6 +65,7 @@ class CapabilitiesTest extends TestCase {
'sharebymail' =>
[
'enabled' => true,
'send_password_by_mail' => true,
'upload_files_drop' => [
'enabled' => true,
],