From f2b1bd1aa9fb34bdf20bbe8387eaca2b0cff93db Mon Sep 17 00:00:00 2001 From: blizzz Date: Tue, 17 Jan 2023 10:32:37 +0100 Subject: [PATCH] Revert "[stable23] Ext storage configs default value support + enable SSL by default" --- apps/files_external/js/settings.js | 8 ----- .../lib/Lib/Backend/AmazonS3.php | 3 +- apps/files_external/lib/Lib/Backend/DAV.php | 3 +- apps/files_external/lib/Lib/Backend/FTP.php | 3 +- .../lib/Lib/Backend/OwnCloud.php | 3 +- .../lib/Lib/DefinitionParameter.php | 34 +++---------------- .../tests/DefinitionParameterTest.php | 3 -- 7 files changed, 8 insertions(+), 49 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 285d4f71118..5db9fe8fe52 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1021,14 +1021,6 @@ MountConfigListView.prototype = _.extend({ newElement = $(''); } - if (placeholder.defaultValue) { - if (placeholder.type === MountConfigListView.ParameterTypes.BOOLEAN) { - newElement.find('input').prop('checked', placeholder.defaultValue); - } else { - newElement.val(placeholder.defaultValue); - } - } - if (placeholder.tooltip) { newElement.attr('title', placeholder.tooltip); } diff --git a/apps/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php index 4625880f414..d85ac3639da 100644 --- a/apps/files_external/lib/Lib/Backend/AmazonS3.php +++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php @@ -47,8 +47,7 @@ class AmazonS3 extends Backend { (new DefinitionParameter('region', $l->t('Region'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('use_ssl', $l->t('Enable SSL'))) - ->setType(DefinitionParameter::VALUE_BOOLEAN) - ->setDefaultValue(true), + ->setType(DefinitionParameter::VALUE_BOOLEAN), (new DefinitionParameter('use_path_style', $l->t('Enable Path Style'))) ->setType(DefinitionParameter::VALUE_BOOLEAN), (new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication'))) diff --git a/apps/files_external/lib/Lib/Backend/DAV.php b/apps/files_external/lib/Lib/Backend/DAV.php index 71c97e639ff..cf16677334d 100644 --- a/apps/files_external/lib/Lib/Backend/DAV.php +++ b/apps/files_external/lib/Lib/Backend/DAV.php @@ -43,8 +43,7 @@ class DAV extends Backend { (new DefinitionParameter('root', $l->t('Remote subfolder'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('secure', $l->t('Secure https://'))) - ->setType(DefinitionParameter::VALUE_BOOLEAN) - ->setDefaultValue(true), + ->setType(DefinitionParameter::VALUE_BOOLEAN), ]) ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) ->setLegacyAuthMechanism($legacyAuth) diff --git a/apps/files_external/lib/Lib/Backend/FTP.php b/apps/files_external/lib/Lib/Backend/FTP.php index d7c6e3bebd6..587f3e68535 100644 --- a/apps/files_external/lib/Lib/Backend/FTP.php +++ b/apps/files_external/lib/Lib/Backend/FTP.php @@ -43,8 +43,7 @@ class FTP extends Backend { (new DefinitionParameter('root', $l->t('Remote subfolder'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('secure', $l->t('Secure ftps://'))) - ->setType(DefinitionParameter::VALUE_BOOLEAN) - ->setDefaultValue(true), + ->setType(DefinitionParameter::VALUE_BOOLEAN), ]) ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) ->setLegacyAuthMechanism($legacyAuth) diff --git a/apps/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php index 97297b6a977..8b33b98b5c4 100644 --- a/apps/files_external/lib/Lib/Backend/OwnCloud.php +++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php @@ -41,8 +41,7 @@ class OwnCloud extends Backend { (new DefinitionParameter('root', $l->t('Remote subfolder'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('secure', $l->t('Secure https://'))) - ->setType(DefinitionParameter::VALUE_BOOLEAN) - ->setDefaultValue(true), + ->setType(DefinitionParameter::VALUE_BOOLEAN), ]) ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) ->setLegacyAuthMechanism($legacyAuth) diff --git a/apps/files_external/lib/Lib/DefinitionParameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php index 440750faca8..fbfbbfd4686 100644 --- a/apps/files_external/lib/Lib/DefinitionParameter.php +++ b/apps/files_external/lib/Lib/DefinitionParameter.php @@ -57,18 +57,13 @@ class DefinitionParameter implements \JsonSerializable { /** @var int flags, see self::FLAG_* constants */ private $flags = self::FLAG_NONE; - /** @var mixed */ - private $defaultValue; - /** - * @param string $name parameter name - * @param string $text parameter description - * @param mixed $defaultValue default value + * @param string $name + * @param string $text */ - public function __construct($name, $text, $defaultValue = null) { + public function __construct($name, $text) { $this->name = $name; $this->text = $text; - $this->defaultValue = $defaultValue; } /** @@ -105,22 +100,6 @@ class DefinitionParameter implements \JsonSerializable { return $this; } - /** - * @return mixed default value - */ - public function getDefaultValue() { - return $this->defaultValue; - } - - /** - * @param mixed $defaultValue default value - * @return self - */ - public function setDefaultValue($defaultValue) { - $this->defaultValue = $defaultValue; - return $this; - } - /** * @return string */ @@ -192,17 +171,12 @@ class DefinitionParameter implements \JsonSerializable { * @return string */ public function jsonSerialize() { - $result = [ + return [ 'value' => $this->getText(), 'flags' => $this->getFlags(), 'type' => $this->getType(), 'tooltip' => $this->getTooltip(), ]; - $defaultValue = $this->getDefaultValue(); - if ($defaultValue) { - $result['defaultValue'] = $defaultValue; - } - return $result; } public function isOptional() { diff --git a/apps/files_external/tests/DefinitionParameterTest.php b/apps/files_external/tests/DefinitionParameterTest.php index 04d5f6762c5..00df3e0aee1 100644 --- a/apps/files_external/tests/DefinitionParameterTest.php +++ b/apps/files_external/tests/DefinitionParameterTest.php @@ -36,18 +36,15 @@ class DefinitionParameterTest extends \Test\TestCase { ], $param->jsonSerialize()); $param->setType(Param::VALUE_BOOLEAN); - $param->setDefaultValue(true); $this->assertEquals([ 'value' => 'bar', 'flags' => 0, 'type' => Param::VALUE_BOOLEAN, 'tooltip' => '', - 'defaultValue' => true, ], $param->jsonSerialize()); $param->setType(Param::VALUE_PASSWORD); $param->setFlag(Param::FLAG_OPTIONAL); - $param->setDefaultValue(null); $this->assertEquals([ 'value' => 'bar', 'flags' => Param::FLAG_OPTIONAL,