diff --git a/apps/sharebymail/tests/SettingsTest.php b/apps/sharebymail/tests/SettingsTest.php
index f415421b0c..8b2fc200d5 100644
--- a/apps/sharebymail/tests/SettingsTest.php
+++ b/apps/sharebymail/tests/SettingsTest.php
@@ -24,6 +24,7 @@ namespace OCA\ShareByMail\Tests;
use OCA\ShareByMail\Settings;
+use OCA\ShareByMail\Settings\SettingsManager;
use Test\TestCase;
class SettingsTest extends TestCase {
@@ -31,10 +32,15 @@ class SettingsTest extends TestCase {
/** @var Settings */
private $instance;
+ /** @var SettingsManager | \PHPUnit_Framework_MockObject_MockObject */
+ private $settingsManager;
+
public function setUp() {
parent::setUp();
- $this->instance = new Settings();
+ $this->settingsManager = $this->getMockBuilder(SettingsManager::class)
+ ->disableOriginalConstructor()->getMock();
+ $this->instance = new Settings($this->settingsManager);
}
public function testAnnounceShareProvider() {
@@ -61,4 +67,30 @@ class SettingsTest extends TestCase {
$this->assertSame($after, $before);
}
+
+ public function testAnnounceShareByMailSettings() {
+ $this->settingsManager->expects($this->once())->method('enforcePasswordProtection')->willReturn(true);
+ $before = [
+ 'oc_appconfig' =>
+ json_encode([
+ 'key1' => 'value1',
+ 'key2' => 'value2'
+ ]),
+ 'oc_foo' => 'oc_bar'
+ ];
+
+ $after = [
+ 'oc_appconfig' =>
+ json_encode([
+ 'key1' => 'value1',
+ 'key2' => 'value2',
+ 'shareByMail' => ['enforcePasswordProtection' => true]
+ ]),
+ 'oc_foo' => 'oc_bar'
+ ];
+
+ $this->instance->announceShareByMailSettings(['array' => &$before]);
+ $this->assertSame($after, $before);
+ }
+
}
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index 581ca9b1b9..269f8e8f41 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -23,10 +23,12 @@
namespace OCA\ShareByMail\Tests;
+use OC\CapabilitiesManager;
use OC\Mail\Message;
use OCA\ShareByMail\Settings\SettingsManager;
use OCA\ShareByMail\ShareByMailProvider;
use OCP\Defaults;
+use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\IDBConnection;
use OCP\IL10N;
@@ -36,6 +38,7 @@ use OCP\IUser;
use OCP\IUserManager;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
+use OCP\Security\IHasher;
use OCP\Security\ISecureRandom;
use OCP\Share\IManager;
use OCP\Share\IShare;
@@ -88,6 +91,12 @@ class ShareByMailProviderTest extends TestCase {
/** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */
private $defaults;
+ /** @var IHasher | \PHPUnit_Framework_MockObject_MockObject */
+ private $hasher;
+
+ /** @var CapabilitiesManager | \PHPUnit_Framework_MockObject_MockObject */
+ private $capabilitiesManager;
+
public function setUp() {
parent::setUp();
@@ -109,6 +118,8 @@ class ShareByMailProviderTest extends TestCase {
$this->activityManager = $this->getMockBuilder('OCP\Activity\IManager')->getMock();
$this->settingsManager = $this->getMockBuilder(SettingsManager::class)->disableOriginalConstructor()->getMock();
$this->defaults = $this->createMock(Defaults::class);
+ $this->hasher = $this->getMockBuilder(IHasher::class)->getMock();
+ $this->capabilitiesManager = $this->getMockBuilder(CapabilitiesManager::class)->disableOriginalConstructor()->getMock();
$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
}
@@ -134,7 +145,9 @@ class ShareByMailProviderTest extends TestCase {
$this->urlGenerator,
$this->activityManager,
$this->settingsManager,
- $this->defaults
+ $this->defaults,
+ $this->hasher,
+ $this->capabilitiesManager
]
);
@@ -154,7 +167,9 @@ class ShareByMailProviderTest extends TestCase {
$this->urlGenerator,
$this->activityManager,
$this->settingsManager,
- $this->defaults
+ $this->defaults,
+ $this->hasher,
+ $this->capabilitiesManager
);
}
@@ -167,15 +182,22 @@ class ShareByMailProviderTest extends TestCase {
public function testCreate() {
$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
- $share->expects($this->once())->method('getSharedWith')->willReturn('user1');
+ $share->expects($this->any())->method('getSharedWith')->willReturn('user1');
- $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createActivity']);
+ $node = $this->getMockBuilder(File::class)->getMock();
+ $node->expects($this->any())->method('getName')->willReturn('filename');
+
+ $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'sendPassword']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
- $instance->expects($this->once())->method('createActivity')->with($share);
+ $instance->expects($this->once())->method('createShareActivity')->with($share);
$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn('rawShare');
$instance->expects($this->once())->method('createShareObject')->with('rawShare')->willReturn('shareObject');
+ $instance->expects($this->any())->method('sendPassword')->willReturn(true);
+ $share->expects($this->any())->method('getNode')->willReturn($node);
+ $this->settingsManager->expects($this->any())->method('enforcePasswordProtection')->willReturn(false);
+ $this->settingsManager->expects($this->any())->method('sendPasswordByMail')->willReturn(true);
$this->assertSame('shareObject',
$instance->create($share)
@@ -273,6 +295,7 @@ class ShareByMailProviderTest extends TestCase {
$uidOwner = 'user2';
$permissions = 1;
$token = 'token';
+ $password = 'password';
$instance = $this->getInstance();
@@ -286,7 +309,8 @@ class ShareByMailProviderTest extends TestCase {
$sharedBy,
$uidOwner,
$permissions,
- $token
+ $token,
+ $password
]
);
@@ -305,6 +329,7 @@ class ShareByMailProviderTest extends TestCase {
$this->assertSame($uidOwner, $result[0]['uid_owner']);
$this->assertSame($permissions, (int)$result[0]['permissions']);
$this->assertSame($token, $result[0]['token']);
+ $this->assertSame($password, $result[0]['password']);
}
@@ -636,7 +661,7 @@ class ShareByMailProviderTest extends TestCase {
$userManager = \OC::$server->getUserManager();
$rootFolder = \OC::$server->getRootFolder();
- $provider = $this->getInstance(['sendMailNotification', 'createActivity']);
+ $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
$u1 = $userManager->createUser('testFed', md5(time()));
$u2 = $userManager->createUser('testFed2', md5(time()));
@@ -678,7 +703,7 @@ class ShareByMailProviderTest extends TestCase {
$userManager = \OC::$server->getUserManager();
$rootFolder = \OC::$server->getRootFolder();
- $provider = $this->getInstance(['sendMailNotification', 'createActivity']);
+ $provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
$u1 = $userManager->createUser('testFed', md5(time()));
$u2 = $userManager->createUser('testFed2', md5(time()));
diff --git a/apps_socialsharing b/apps_socialsharing
new file mode 160000
index 0000000000..a1157abb8a
--- /dev/null
+++ b/apps_socialsharing
@@ -0,0 +1 @@
+Subproject commit a1157abb8a37862f87f5012317f9323113467737
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 1ead631db4..16ab904ad4 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -29,6 +29,7 @@
isMailShareAllowed: oc_appconfig.shareByMailEnabled !== undefined,
defaultExpireDate: oc_appconfig.core.defaultExpireDate,
isResharingAllowed: oc_appconfig.core.resharingAllowed,
+ isPasswordForMailSharesRequired: (oc_appconfig.shareByMail === undefined) ? false : oc_appconfig.shareByMail.enforcePasswordProtection,
allowGroupSharing: oc_appconfig.core.allowGroupSharing
},
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 6903dd57c3..3a481e53dd 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -100,7 +100,7 @@
'{{/if}}' +
'