SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 75 Pull Requests 2 Projects 1 Releases 24 Wiki Activity

feat: Enable server provider logging

pull/152/head
NaiJi ✨ 2022-12-15 15:42:21 +04:00
parent 968667e4bf
commit 7847839ea6
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/translations/en.json
View File

@ -392,6 +392,7 @@
"generation_error": "Couldn't generate a recovery key. {}" "generation_error": "Couldn't generate a recovery key. {}"
}, },
"modals": { "modals": {
"server_validators_error": "Couldn't fetch available servers.",
"already_exists": "Such server already exists.", "already_exists": "Such server already exists.",
"unexpected_error": "Unexpected error during placement from the provider side.", "unexpected_error": "Unexpected error during placement from the provider side.",
"destroy_server": "Destroy the server and create a new one?", "destroy_server": "Destroy the server and create a new one?",

1
assets/translations/ru.json
View File

@ -392,6 +392,7 @@
"generation_error": "Не удалось сгенерировать ключ. {}" "generation_error": "Не удалось сгенерировать ключ. {}"
}, },
"modals": { "modals": {
"server_validators_error": "Не удалось получить список серверов.",
"already_exists": "Такой сервер уже существует.", "already_exists": "Такой сервер уже существует.",
"unexpected_error": "Непредвиденная ошибка со стороны провайдера.", "unexpected_error": "Непредвиденная ошибка со стороны провайдера.",
"destroy_server": "Уничтожить сервер и создать новый?", "destroy_server": "Уничтожить сервер и создать новый?",

2
lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart
View File

@ -23,7 +23,7 @@ import 'package:selfprivacy/utils/password_generator.dart';
class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi {
DigitalOceanApi({ DigitalOceanApi({
required this.region, required this.region,
this.hasLogger = false, this.hasLogger = true,
this.isWithToken = true, this.isWithToken = true,
}); });
@override @override

2
lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart
View File

@ -24,7 +24,7 @@ import 'package:selfprivacy/utils/password_generator.dart';
class HetznerApi extends ServerProviderApi with VolumeProviderApi { class HetznerApi extends ServerProviderApi with VolumeProviderApi {
HetznerApi({ HetznerApi({
this.region, this.region,
this.hasLogger = false, this.hasLogger = true,
this.isWithToken = true, this.isWithToken = true,
}); });
@override @override

33
lib/logic/cubit/server_installation/server_installation_cubit.dart
View File

@ -633,18 +633,27 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
state as ServerInstallationRecovery; state as ServerInstallationRecovery;
final List<ServerBasicInfo> servers = final List<ServerBasicInfo> servers =
await repository.getServersOnProviderAccount(); await repository.getServersOnProviderAccount();
final Iterable<ServerBasicInfoWithValidators> validated = servers.map( List<ServerBasicInfoWithValidators> validatedList = [];
(final ServerBasicInfo server) => try {
ServerBasicInfoWithValidators.fromServerBasicInfo( final Iterable<ServerBasicInfoWithValidators> validated = servers.map(
serverBasicInfo: server, (final ServerBasicInfo server) =>
isIpValid: server.ip == dataState.serverDetails?.ip4, ServerBasicInfoWithValidators.fromServerBasicInfo(
isReverseDnsValid: serverBasicInfo: server,
server.reverseDns == dataState.serverDomain?.domainName || isIpValid: server.ip == dataState.serverDetails?.ip4,
server.reverseDns == isReverseDnsValid:
dataState.serverDomain?.domainName.split('.')[0], server.reverseDns == dataState.serverDomain?.domainName ||
), server.reverseDns ==
); dataState.serverDomain?.domainName.split('.')[0],
return validated.toList(); ),
);
validatedList = validated.toList();
} catch (e) {
print(e);
getIt<NavigationService>()
.showSnackBar('modals.server_validators_error'.tr());
}
return validatedList;
} }
Future<void> setServerId(final ServerBasicInfo server) async { Future<void> setServerId(final ServerBasicInfo server) async {