From 80f28463ec167556fca6b87fad4f3026d3a8e7e5 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Fri, 21 Jul 2023 18:07:26 -0300 Subject: [PATCH] fix(recovery): Implement server type id requesting on recovery finish --- .../server_installation_cubit.dart | 3 ++ lib/logic/models/server_basic_info.dart | 4 ++ .../server_providers/digital_ocean.dart | 52 +++++++++++++++++++ .../providers/server_providers/hetzner.dart | 48 +++++++++++++++++ .../server_providers/server_provider.dart | 7 +++ 5 files changed, 114 insertions(+) diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart index 3f00a5b5..968444e8 100644 --- a/lib/logic/cubit/server_installation/server_installation_cubit.dart +++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart @@ -721,12 +721,15 @@ class ServerInstallationCubit extends Cubit { await repository.saveIsServerResetedSecondTime(true); await repository.saveHasFinalChecked(true); await repository.saveIsRecoveringServer(false); + final serverInfo = await ProvidersController.currentServerProvider! + .getServerInfo(state.serverDetails!.id); final User mainUser = await repository.getMainUser(); await repository.saveRootUser(mainUser); final ServerInstallationRecovery updatedState = (state as ServerInstallationRecovery).copyWith( backblazeCredential: backblazeCredential, rootUser: mainUser, + serverTypeIdentificator: serverInfo.data?.serverTypeId ?? '', ); emit(updatedState.finish()); } diff --git a/lib/logic/models/server_basic_info.dart b/lib/logic/models/server_basic_info.dart index 3037a2d5..dc7b9165 100644 --- a/lib/logic/models/server_basic_info.dart +++ b/lib/logic/models/server_basic_info.dart @@ -3,12 +3,14 @@ class ServerBasicInfo { required this.id, required this.name, required this.reverseDns, + required this.serverTypeId, required this.ip, required this.created, }); final int id; final String name; final String reverseDns; + final String serverTypeId; final String ip; final DateTime created; } @@ -22,6 +24,7 @@ class ServerBasicInfoWithValidators extends ServerBasicInfo { id: serverBasicInfo.id, name: serverBasicInfo.name, reverseDns: serverBasicInfo.reverseDns, + serverTypeId: serverBasicInfo.serverTypeId, ip: serverBasicInfo.ip, created: serverBasicInfo.created, isIpValid: isIpValid, @@ -32,6 +35,7 @@ class ServerBasicInfoWithValidators extends ServerBasicInfo { required super.id, required super.name, required super.reverseDns, + required super.serverTypeId, required super.ip, required super.created, required this.isIpValid, diff --git a/lib/logic/providers/server_providers/digital_ocean.dart b/lib/logic/providers/server_providers/digital_ocean.dart index bca7bd97..7b613698 100644 --- a/lib/logic/providers/server_providers/digital_ocean.dart +++ b/lib/logic/providers/server_providers/digital_ocean.dart @@ -81,6 +81,7 @@ class DigitalOceanServerProvider extends ServerProvider { created: DateTime.now(), ip: ipv4, name: server['name'], + serverTypeId: server['region']['slug'], ); }, ).toList(); @@ -88,6 +89,57 @@ class DigitalOceanServerProvider extends ServerProvider { return GenericResult(success: true, data: servers); } + @override + Future> getServerInfo( + final int serverId, + ) async { + ServerBasicInfo? server; + final result = await _adapter.api().getServers(); + if (result.data.isEmpty || !result.success) { + return GenericResult( + success: result.success, + data: server, + code: result.code, + message: result.message, + ); + } + + final rawServers = result.data; + for (final rawServer in rawServers) { + String? ipv4; + if (rawServer['networks']['v4'].isNotEmpty) { + for (final v4 in rawServer['networks']['v4']) { + if (v4['type'].toString() == 'public') { + ipv4 = v4['ip_address'].toString(); + } + } + } + + try { + server = ServerBasicInfo( + id: rawServer['id'], + reverseDns: rawServer['name'], + created: DateTime.now(), + ip: ipv4!, + name: rawServer['name'], + serverTypeId: rawServer['region']['slug'], + ); + } catch (e) { + print(e); + continue; + } + } + + if (server == null) { + return GenericResult( + success: false, + data: server, + ); + } + + return GenericResult(success: true, data: server); + } + @override Future> launchInstallation( final LaunchInstallationData installationData, diff --git a/lib/logic/providers/server_providers/hetzner.dart b/lib/logic/providers/server_providers/hetzner.dart index 140c1542..db9ddc03 100644 --- a/lib/logic/providers/server_providers/hetzner.dart +++ b/lib/logic/providers/server_providers/hetzner.dart @@ -77,6 +77,7 @@ class HetznerServerProvider extends ServerProvider { ip: hetznerServer.publicNet.ipv4!.ip, reverseDns: hetznerServer.publicNet.ipv4!.reverseDns, created: hetznerServer.created, + serverTypeId: hetznerServer.name, ); } catch (e) { continue; @@ -88,6 +89,53 @@ class HetznerServerProvider extends ServerProvider { return GenericResult(success: true, data: servers); } + @override + Future> getServerInfo( + final int serverId, + ) async { + ServerBasicInfo? server; + final result = await _adapter.api().getServers(); + if (result.data.isEmpty || !result.success) { + return GenericResult( + success: result.success, + data: server, + code: result.code, + message: result.message, + ); + } + + final List hetznerServers = result.data; + for (final hetznerServer in hetznerServers) { + if (hetznerServer.publicNet.ipv4 == null || + hetznerServer.id != serverId) { + continue; + } + + try { + server = ServerBasicInfo( + id: hetznerServer.id, + name: hetznerServer.name, + ip: hetznerServer.publicNet.ipv4!.ip, + reverseDns: hetznerServer.publicNet.ipv4!.reverseDns, + created: hetznerServer.created, + serverTypeId: hetznerServer.serverType.name, + ); + } catch (e) { + print(e); + continue; + } + } + + if (server == null) { + return GenericResult( + success: false, + data: server, + ); + } + + return GenericResult(success: true, data: server); + } + @override Future> launchInstallation( final LaunchInstallationData installationData, diff --git a/lib/logic/providers/server_providers/server_provider.dart b/lib/logic/providers/server_providers/server_provider.dart index f71ce09a..4182d9fc 100644 --- a/lib/logic/providers/server_providers/server_provider.dart +++ b/lib/logic/providers/server_providers/server_provider.dart @@ -24,6 +24,13 @@ abstract class ServerProvider { /// Only with public IPv4 addresses. Future>> getServers(); + /// Returns actual [ServerBasicInfo] of the + /// requested server entry assigned + /// to the authorized user. + /// + /// Only with public IPv4 address. + Future> getServerInfo(final int serverId); + /// Tries to launch installation of SelfPrivacy on /// the requested server entry for the authorized account. /// Depending on a server provider, the algorithm