SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-27 03:06:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix revert routing errors

Browse source
This commit is contained in:
NaiJi 2022-06-15 06:23:54 +03:00
parent 313cfc7187
commit 6a22e2db6f
7 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/logic/cubit/server_installation/server_installation_cubit.dart
View file

@ -411,6 +411,7 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
case RecoveryStep.recoveryKey:
case RecoveryStep.newDeviceKey:
case RecoveryStep.oldToken:
case RecoveryStep.hetznerToken:
emit(
dataState.copyWith(
currentStep: RecoveryStep.selecting,
@ -425,6 +426,23 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
),
);
break;
case RecoveryStep.cloudflareToken:
repository.deleteDomain();
repository.deleteServerDetails();
emit(
dataState.copyWith(
currentStep: RecoveryStep.serverSelection,
),
);
break;
case RecoveryStep.backblazeToken:
repository.deleteBackblazeKey();
emit(
dataState.copyWith(
currentStep: RecoveryStep.cloudflareToken,
),
);
break;
// We won't revert steps after client is authorized
default:
break;

15
lib/logic/cubit/server_installation/server_installation_repository.dart
View file

@ -603,6 +603,11 @@ class ServerInstallationRepository {
await getIt<ApiConfigModel>().storeServerDetails(serverDetails);
}
Future<void> deleteServerDetails() async {
await box.delete(BNames.serverDetails);
getIt<ApiConfigModel>().init();
}
Future<void> saveHetznerKey(final String key) async {
print('saved');
await getIt<ApiConfigModel>().storeHetznerKey(key);
@ -619,10 +624,20 @@ class ServerInstallationRepository {
await getIt<ApiConfigModel>().storeBackblazeCredential(backblazeCredential);
}
Future<void> deleteBackblazeKey() async {
await box.delete(BNames.backblazeCredential);
getIt<ApiConfigModel>().init();
}
Future<void> saveCloudFlareKey(final String key) async {
await getIt<ApiConfigModel>().storeCloudFlareKey(key);
}
Future<void> deleteCloudFlareKey() async {
await box.delete(BNames.cloudFlareKey);
getIt<ApiConfigModel>().init();
}
Future<void> saveDomain(final ServerDomain serverDomain) async {
await getIt<ApiConfigModel>().storeServerDomain(serverDomain);
}

2
lib/logic/get_it/api_config.dart
View file

@ -34,7 +34,6 @@ class ApiConfigModel {
Future<void> storeBackblazeCredential(final BackblazeCredential value) async {
await _box.put(BNames.backblazeCredential, value);
_backblazeCredential = value;
}
@ -64,7 +63,6 @@ class ApiConfigModel {
void init() {
_hetznerKey = _box.get(BNames.hetznerKey);
_cloudFlareKey = _box.get(BNames.cloudFlareKey);
_backblazeCredential = _box.get(BNames.backblazeCredential);
_serverDomain = _box.get(BNames.serverDomain);

2
lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart
View file

@ -28,6 +28,8 @@ class RecoveryConfirmBackblaze extends StatelessWidget {
heroTitle: 'recovering.confirm_backblaze'.tr(),
heroSubtitle: 'recovering.confirm_backblaze_description'.tr(),
hasBackButton: true,
onBackButtonPressed:
context.read<ServerInstallationCubit>().revertRecoveryStep,
hasFlashButton: false,
children: [
CubitFormTextField(

2
lib/ui/pages/setup/recovering/recovery_confirm_cloudflare.dart
View file

@ -31,6 +31,8 @@ class RecoveryConfirmCloudflare extends StatelessWidget {
),
hasBackButton: true,
hasFlashButton: false,
onBackButtonPressed:
context.read<ServerInstallationCubit>().revertRecoveryStep,
children: [
CubitFormTextField(
formFieldCubit: context.read<CloudFlareFormCubit>().apiKey,

2
lib/ui/pages/setup/recovering/recovery_confirm_server.dart
View file

@ -39,6 +39,8 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
? 'recovering.choose_server_description'.tr()
: 'recovering.confirm_server_description'.tr(),
hasBackButton: true,
onBackButtonPressed:
context.read<ServerInstallationCubit>().revertRecoveryStep,
hasFlashButton: false,
children: [
FutureBuilder<List<ServerBasicInfoWithValidators>>(

2
lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart
View file

@ -32,6 +32,8 @@ class RecoveryHetznerConnected extends StatelessWidget {
),
hasBackButton: true,
hasFlashButton: false,
onBackButtonPressed:
context.read<ServerInstallationCubit>().revertRecoveryStep,
children: [
CubitFormTextField(
formFieldCubit: context.read<HetznerFormCubit>().apiKey,