fix
This commit is contained in:
parent
225a5cedc5
commit
12ef6910ed
@ -12,6 +12,10 @@ class NullPasswordException implements Exception {
|
|||||||
String error() => 'password cannot be null';
|
String error() => 'password cannot be null';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class AuthenticationFailedException implements Exception {
|
||||||
|
String error() => 'failed to authenticate user';
|
||||||
|
}
|
||||||
|
|
||||||
// ignore: prefer_function_declarations_over_variables
|
// ignore: prefer_function_declarations_over_variables
|
||||||
final Validator noRestrictedChars = (value) {
|
final Validator noRestrictedChars = (value) {
|
||||||
return [
|
return [
|
||||||
@ -231,29 +235,36 @@ bool validateSettings(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<Map<String, dynamic>> convertAllToString(
|
Future<Map<String, dynamic>> convertAllToString(
|
||||||
Map<String, dynamic> settings,
|
Map<String, dynamic> settings, {
|
||||||
) async {
|
String? password,
|
||||||
final password = await promptPassword();
|
}) async {
|
||||||
|
for (var entry in settings.entries) {
|
||||||
|
if (entry.value is Map<String, dynamic>) {
|
||||||
|
convertAllToString(entry.value, password: password);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entry.key == 'ApiPassword' ||
|
||||||
|
entry.key == 'EncryptionToken' ||
|
||||||
|
entry.key == 'SecretKey') {
|
||||||
|
if (entry.value.isEmpty) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password == null) {
|
||||||
|
password = await promptPassword();
|
||||||
if (password == null) {
|
if (password == null) {
|
||||||
throw NullPasswordException();
|
throw NullPasswordException();
|
||||||
}
|
}
|
||||||
|
|
||||||
settings.forEach((key, value) {
|
|
||||||
if (value is Map<String, dynamic>) {
|
|
||||||
convertAllToString(value);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (key == 'ApiPassword' ||
|
settings[entry.key] = encryptValue(entry.value, password);
|
||||||
key == 'EncryptionToken' ||
|
} else if (entry.value is String) {
|
||||||
key == 'SecretKey') {
|
continue;
|
||||||
value = encryptValue(value, password);
|
|
||||||
} else if (value is String) {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
settings[key] = value.toString();
|
settings[entry.key] = entry.value.toString();
|
||||||
});
|
}
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,12 @@ import 'dart:convert' show jsonEncode;
|
|||||||
import 'package:collection/collection.dart';
|
import 'package:collection/collection.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:repertory/constants.dart' as constants;
|
||||||
import 'package:repertory/helpers.dart'
|
import 'package:repertory/helpers.dart'
|
||||||
show
|
show
|
||||||
|
AuthenticationFailedException,
|
||||||
convertAllToString,
|
convertAllToString,
|
||||||
|
displayErrorMessage,
|
||||||
getBaseUri,
|
getBaseUri,
|
||||||
getSettingDescription,
|
getSettingDescription,
|
||||||
getSettingValidators,
|
getSettingValidators,
|
||||||
@ -104,22 +107,36 @@ class _UISettingsWidgetState extends State<UISettingsWidget> {
|
|||||||
widget.settings,
|
widget.settings,
|
||||||
widget.origSettings,
|
widget.origSettings,
|
||||||
)) {
|
)) {
|
||||||
|
displayAuthError() {
|
||||||
|
if (constants.navigatorKey.currentContext != null) {
|
||||||
|
displayErrorMessage(
|
||||||
|
constants.navigatorKey.currentContext!,
|
||||||
|
"Authentication failed",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
convertAllToString(widget.settings)
|
convertAllToString(widget.settings)
|
||||||
.then((map) async {
|
.then((map) async {
|
||||||
try {
|
try {
|
||||||
await http.put(
|
final response = await http.put(
|
||||||
Uri.parse(
|
Uri.parse(
|
||||||
Uri.encodeFull(
|
Uri.encodeFull(
|
||||||
'${getBaseUri()}/api/v1/settings?data=${jsonEncode(map)}',
|
'${getBaseUri()}/api/v1/settings?data=${jsonEncode(map)}',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
if (response.statusCode == 500) {
|
||||||
|
displayAuthError();
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
debugPrint('$e');
|
debugPrint('$e');
|
||||||
|
displayAuthError();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catchError((e) {
|
.catchError((e) {
|
||||||
debugPrint('$e');
|
debugPrint('$e');
|
||||||
|
displayAuthError();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user