diff --git a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart index f3df6e54..4bc13ae7 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart @@ -194,7 +194,8 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { } @override - Future attachVolume(final ServerVolume volume, final int serverId) async { + Future attachVolume( + final ServerVolume volume, final int serverId) async { bool success = false; final Response dbPostResponse; @@ -311,8 +312,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { final int serverId = serverCreateResponse.data['server']['id']; final ServerVolume? newVolume = await createVolume(); - final bool attachedVolume = - await attachVolume(newVolume!, serverId); + final bool attachedVolume = await attachVolume(newVolume!, serverId); if (attachedVolume) { serverDetails = ServerHostingDetails( @@ -367,10 +367,12 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { final Dio client = await getClient(); try { - await client.post('/droplets/${server.id}/actions', - data: { - 'type': 'reboot', - },); + await client.post( + '/droplets/${server.id}/actions', + data: { + 'type': 'reboot', + }, + ); } catch (e) { print(e); } finally { @@ -386,10 +388,11 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { final Dio client = await getClient(); try { - await client.post('/droplets/${server.id}/actions', - data: { - 'type': 'power_on', - }, + await client.post( + '/droplets/${server.id}/actions', + data: { + 'type': 'power_on', + }, ); } catch (e) { print(e); diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart index 8373adb7..7edb4cf1 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart @@ -229,7 +229,8 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi { } @override - Future attachVolume(final ServerVolume volume, final int serverId) async { + Future attachVolume( + final ServerVolume volume, final int serverId) async { bool success = false; final Response dbPostResponse; diff --git a/lib/logic/cubit/forms/setup/initializing/provider_form_cubit.dart b/lib/logic/cubit/forms/setup/initializing/provider_form_cubit.dart index 727daea8..7405073e 100644 --- a/lib/logic/cubit/forms/setup/initializing/provider_form_cubit.dart +++ b/lib/logic/cubit/forms/setup/initializing/provider_form_cubit.dart @@ -7,16 +7,10 @@ import 'package:selfprivacy/logic/cubit/forms/validations/validations.dart'; class ProviderFormCubit extends FormCubit { ProviderFormCubit(this.serverInstallationCubit) { - final RegExp regExp = - serverInstallationCubit.getServerProviderApiTokenValidation(); apiKey = FieldCubit( initalValue: '', validations: [ RequiredStringValidation('validations.required'.tr()), - ValidationModel( - regExp.hasMatch, - 'validations.invalid_format'.tr(), - ), LengthStringNotEqualValidation(64) ], ); diff --git a/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart b/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart index bf8595ea..b92a51c5 100644 --- a/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart +++ b/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart @@ -71,9 +71,7 @@ class ApiProviderVolumeCubit } Future detachVolume(final DiskVolume volume) async { - await providerApi! - .getVolumeProvider() - .detachVolume(volume.providerVolume!); + await providerApi!.getVolumeProvider().detachVolume(volume.providerVolume!); refresh(); } @@ -135,9 +133,7 @@ class ApiProviderVolumeCubit } Future deleteVolume(final DiskVolume volume) async { - await providerApi! - .getVolumeProvider() - .deleteVolume(volume.providerVolume!); + await providerApi!.getVolumeProvider().deleteVolume(volume.providerVolume!); refresh(); } diff --git a/lib/ui/pages/setup/initializing/initializing.dart b/lib/ui/pages/setup/initializing/initializing.dart index 029a30e4..eb6f05a5 100644 --- a/lib/ui/pages/setup/initializing/initializing.dart +++ b/lib/ui/pages/setup/initializing/initializing.dart @@ -141,13 +141,13 @@ class InitializingPage extends StatelessWidget { } Widget _stepServerProviderToken( - final ServerInstallationCubit serverInstallationCubit) => - ServerProviderPicker( - serverInstallationCubit: serverInstallationCubit, - ); + final ServerInstallationCubit serverInstallationCubit, + ) => + const ServerProviderPicker(); Widget _stepServerType( - final ServerInstallationCubit serverInstallationCubit) => + final ServerInstallationCubit serverInstallationCubit, + ) => ServerTypePicker( serverInstallationCubit: serverInstallationCubit, ); diff --git a/lib/ui/pages/setup/initializing/server_provider_picker.dart b/lib/ui/pages/setup/initializing/server_provider_picker.dart index ee0ab36a..c8b8e828 100644 --- a/lib/ui/pages/setup/initializing/server_provider_picker.dart +++ b/lib/ui/pages/setup/initializing/server_provider_picker.dart @@ -11,12 +11,9 @@ import 'package:selfprivacy/ui/components/brand_md/brand_md.dart'; class ServerProviderPicker extends StatefulWidget { const ServerProviderPicker({ - required this.serverInstallationCubit, super.key, }); - final ServerInstallationCubit serverInstallationCubit; - @override State createState() => _ServerProviderPickerState(); } @@ -40,7 +37,6 @@ class _ServerProviderPickerState extends State { case ServerProvider.hetzner: return ProviderInputDataPage( - serverInstallationCubit: widget.serverInstallationCubit, providerInfo: ProviderPageInfo( providerType: ServerProvider.hetzner, pathToHow: 'hetzner_how', @@ -53,7 +49,6 @@ class _ServerProviderPickerState extends State { case ServerProvider.digitalOcean: return ProviderInputDataPage( - serverInstallationCubit: widget.serverInstallationCubit, providerInfo: ProviderPageInfo( providerType: ServerProvider.digitalOcean, pathToHow: 'hetzner_how', @@ -82,17 +77,15 @@ class ProviderPageInfo { class ProviderInputDataPage extends StatelessWidget { const ProviderInputDataPage({ required this.providerInfo, - required this.serverInstallationCubit, super.key, }); final ProviderPageInfo providerInfo; - final ServerInstallationCubit serverInstallationCubit; @override Widget build(final BuildContext context) => BlocProvider( create: (final context) => ProviderFormCubit( - serverInstallationCubit, + context.watch(), ), child: Builder( builder: (final context) {