web/repertory/lib/helpers.dart

@@ -79,8 +79,6 @@ String getBaseUri() {
 
 List<Validator> getSettingValidators(String settingPath) {
   switch (settingPath) {
-    case 'ApiAuth':
-      return [(value) => value.isNotEmpty];
     case 'EncryptConfig.EncryptionToken':
       return [(value) => value.isNotEmpty];
     case 'EncryptConfig.Path':
@@ -110,11 +108,11 @@ List<Validator> getSettingValidators(String settingPath) {
     case 'HostConfig.Protocol':
       return [(value) => value == "http" || value == "https"];
     case 'S3Config.AccessKey':
-      return [(value) => value.trim().isNotEmpty];
+      return [(value) => value.isNotEmpty];
     case 'S3Config.Bucket':
       return [(value) => value.trim().isNotEmpty];
     case 'S3Config.SecretKey':
-      return [(value) => value.trim().isNotEmpty];
+      return [(value) => value.isNotEmpty];
     case 'S3Config.URL':
       return [(value) => Uri.tryParse(value) != null];
     case 'SiaConfig.Bucket':

web/repertory/lib/screens/add_mount_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:repertory/constants.dart';
 import 'package:repertory/helpers.dart';
@@ -99,9 +98,6 @@ class _AddMountScreenState extends State<AddMountScreen> {
                         autofocus: true,
                         controller: _mountNameController,
                         keyboardType: TextInputType.text,
-                        inputFormatters: [
-                          FilteringTextInputFormatter.deny(RegExp(r'\s')),
-                        ],
                         onChanged: (_) => _handleChange(_mountType),
                       ),
                     ],

web/repertory/lib/widgets/mount_settings.dart

@@ -26,8 +26,6 @@ class MountSettingsWidget extends StatefulWidget {
 }
 
 class _MountSettingsWidgetState extends State<MountSettingsWidget> {
-  static const _padding = 15.0;
-
   void _addBooleanSetting(list, root, key, value, isAdvanced) {
     if (!isAdvanced || widget.showAdvanced) {
       list.add(
@@ -183,87 +181,13 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
     }
   }
 
-  void _addPasswordSetting(
-    list,
-    root,
-    key,
-    value,
-    isAdvanced, {
-    List<Validator> validators = const [],
-  }) {
+  void _addPasswordSetting(list, root, key, value, isAdvanced) {
     if (!isAdvanced || widget.showAdvanced) {
       list.add(
         SettingsTile.navigation(
           leading: Icon(Icons.password),
           title: Text(key),
           value: Text('*' * (value as String).length),
-          onPressed: (_) {
-            String updatedValue1 = value;
-            String updatedValue2 = value;
-            showDialog(
-              context: context,
-              builder: (context) {
-                return AlertDialog(
-                  actions: [
-                    TextButton(
-                      child: Text('Cancel'),
-                      onPressed: () => Navigator.of(context).pop(),
-                    ),
-                    TextButton(
-                      child: Text('OK'),
-                      onPressed: () {
-                        if (updatedValue1 != updatedValue2) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text("'$key' does not match")),
-                          );
-                          return;
-                        }
-
-                        final result = validators.firstWhereOrNull(
-                          (validator) => !validator(updatedValue1),
-                        );
-                        if (result != null) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text("'$key' is not valid")),
-                          );
-                          return;
-                        }
-
-                        setState(() {
-                          root[key] = updatedValue1;
-                          widget.onChanged?.call(widget.settings);
-                        });
-                        Navigator.of(context).pop();
-                      },
-                    ),
-                  ],
-                  content: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      TextField(
-                        autofocus: true,
-                        controller: TextEditingController(text: updatedValue1),
-                        obscureText: true,
-                        obscuringCharacter: '*',
-                        onChanged: (value) => updatedValue1 = value,
-                      ),
-                      const SizedBox(height: _padding),
-                      TextField(
-                        autofocus: false,
-                        controller: TextEditingController(text: updatedValue2),
-                        obscureText: true,
-                        obscuringCharacter: '*',
-                        onChanged: (value) => updatedValue2 = value,
-                      ),
-                    ],
-                  ),
-                  title: Text(key),
-                );
-              },
-            );
-          },
         ),
       );
     }
@@ -318,9 +242,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
                   content: TextField(
                     autofocus: true,
                     controller: TextEditingController(text: updatedValue),
-                    inputFormatters: [
-                      FilteringTextInputFormatter.deny(RegExp(r'\s')),
-                    ],
                     onChanged: (value) => updatedValue = value,
                   ),
                   title: Text(key),
@@ -345,14 +266,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
 
     widget.settings.forEach((key, value) {
       if (key == 'ApiAuth') {
-        _addPasswordSetting(
-          commonSettings,
-          widget.settings,
-          key,
-          value,
-          true,
-          validators: getSettingValidators(key),
-        );
+        _addPasswordSetting(commonSettings, widget.settings, key, value, true);
       } else if (key == 'ApiPort') {
         _addIntSetting(
           commonSettings,
@@ -482,7 +396,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'Path') {
             _addStringSetting(
@@ -515,7 +428,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'ApiPort') {
             _addIntSetting(
@@ -594,7 +506,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'HostNameOrIp') {
             _addStringSetting(
@@ -672,21 +583,18 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           }
         });
       } else if (key == 'S3Config') {
         value.forEach((subKey, subValue) {
           if (subKey == 'AccessKey') {
-            _addStringSetting(
+            _addPasswordSetting(
               s3ConfigSettings,
               widget.settings[key],
               subKey,
               subValue,
-              Icons.key,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'Bucket') {
             _addStringSetting(
@@ -705,7 +613,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'Region') {
             _addStringSetting(
@@ -724,7 +631,6 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
               subKey,
               subValue,
               false,
-              validators: getSettingValidators('$key.$subKey'),
             );
           } else if (subKey == 'TimeoutMs') {
             _addIntSetting(