Cleanup share by mail a bit

apps/files_sharing/src/services/ConfigService.js

@@ -178,7 +178,7 @@ export default class Config {
 	 * @memberof Config
 	 */
 	get isMailShareAllowed() {
-		return OC.appConfig.shareByMailEnabled !== undefined
+		return OC.getCapabilities()['files_sharing']['sharebymail'] !== undefined
 			&& OC.getCapabilities()['files_sharing']['public']['enabled'] === true
 	}
 
@@ -223,7 +223,7 @@ export default class Config {
 	 * @memberof Config
 	 */
 	get isPasswordForMailSharesRequired() {
-		return (OC.appConfig.shareByMail === undefined) ? false : OC.appConfig.shareByMail.enforcePasswordProtection === true
+		return (OC.getCapabilities()['files_sharing']['sharebymail'] === undefined) ? false : OC.getCapabilities()['files_sharing']['sharebymail']['password']['enforced']
 	}
 
 	/**

apps/sharebymail/composer/composer/autoload_classmap.php

@@ -9,7 +9,6 @@
     'OCA\\ShareByMail\\Activity' => $baseDir . '/../lib/Activity.php',
     'OCA\\ShareByMail\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\ShareByMail\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\ShareByMail\\Settings' => $baseDir . '/../lib/Settings.php',
     'OCA\\ShareByMail\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
     'OCA\\ShareByMail\\Settings\\SettingsManager' => $baseDir . '/../lib/Settings/SettingsManager.php',
     'OCA\\ShareByMail\\ShareByMailProvider' => $baseDir . '/../lib/ShareByMailProvider.php',

apps/sharebymail/composer/composer/autoload_static.php

@@ -24,7 +24,6 @@ class ComposerStaticInitShareByMail
         'OCA\\ShareByMail\\Activity' => __DIR__ . '/..' . '/../lib/Activity.php',
         'OCA\\ShareByMail\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\ShareByMail\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\ShareByMail\\Settings' => __DIR__ . '/..' . '/../lib/Settings.php',
         'OCA\\ShareByMail\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
         'OCA\\ShareByMail\\Settings\\SettingsManager' => __DIR__ . '/..' . '/../lib/Settings/SettingsManager.php',
         'OCA\\ShareByMail\\ShareByMailProvider' => __DIR__ . '/..' . '/../lib/ShareByMailProvider.php',

apps/sharebymail/lib/AppInfo/Application.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
  *
@@ -27,23 +29,22 @@
 namespace OCA\ShareByMail\AppInfo;
 
 use OCA\ShareByMail\Capabilities;
-use OCA\ShareByMail\Settings;
 use OCP\AppFramework\App;
-use OCP\Util;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
-class Application extends App {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('sharebymail', $urlParams);
+class Application extends App implements IBootstrap {
+	public const APP_ID = 'sharebymail';
 
-		$settingsManager = \OC::$server->query(Settings\SettingsManager::class);
-		$settings = new Settings($settingsManager);
+	public function __construct() {
+		parent::__construct(self::APP_ID);
+	}
 
-		/** register capabilities */
-		$container = $this->getContainer();
-		$container->registerCapability(Capabilities::class);
+	public function register(IRegistrationContext $context): void {
+		$context->registerCapability(Capabilities::class);
+	}
 
-		/** register hooks */
-		Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider');
-		Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareByMailSettings');
+	public function boot(IBootContext $context): void {
 	}
 }

apps/sharebymail/lib/Capabilities.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
  *
@@ -23,26 +25,35 @@
 
 namespace OCA\ShareByMail;
 
+use OCA\ShareByMail\Settings\SettingsManager;
 use OCP\Capabilities\ICapability;
 
 class Capabilities implements ICapability {
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
+	/** @var SettingsManager */
+	private $manager;
+
+	public function __construct(SettingsManager $manager) {
+		$this->manager = $manager;
+	}
+
+	public function getCapabilities(): array {
 		return [
 			'files_sharing' =>
 				[
 					'sharebymail' =>
 						[
 							'enabled' => true,
-							'upload_files_drop' => ['enabled' => true],
-							'password' => ['enabled' => true],
-							'expire_date' => ['enabled' => true]
+							'upload_files_drop' => [
+								'enabled' => true,
+							],
+							'password' => [
+								'enabled' => true,
+								'enforced' => $this->manager->enforcePasswordProtection(),
+							],
+							'expire_date' => [
+								'enabled' => true,
+							],
 						]
 				]
 		];

apps/sharebymail/lib/Settings/SettingsManager.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
  *
@@ -43,7 +45,7 @@ public function __construct(IConfig $config) {
 	 *
 	 * @return bool
 	 */
-	public function sendPasswordByMail() {
+	public function sendPasswordByMail(): bool {
 		$sendPasswordByMail = $this->config->getAppValue('sharebymail', 'sendpasswordmail', $this->sendPasswordByMailDefault);
 		return $sendPasswordByMail === 'yes';
 	}
@@ -53,7 +55,7 @@ public function sendPasswordByMail() {
 	 *
 	 * @return bool
 	 */
-	public function enforcePasswordProtection() {
+	public function enforcePasswordProtection(): bool {
 		$enforcePassword = $this->config->getAppValue('sharebymail', 'enforcePasswordProtection', $this->enforcePasswordProtectionDefault);
 		return $enforcePassword === 'yes';
 	}