Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

2FA

This commit is contained in:
Hillel Coren 2021-02-25 17:33:04 +02:00
parent 7f05a3cbaf
commit aa4c5e6593
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redux/settings/settings_actions.dart
View File

@ -90,8 +90,8 @@ class SaveUserSettingsFailure implements StopSaving {
class SaveAuthUserRequest implements StartSaving {
SaveAuthUserRequest({
@required this.completer,
@required this.user,
this.completer,
this.password,
this.idToken,
});

8
lib/redux/settings/settings_middleware.dart
View File

@ -106,14 +106,18 @@ Middleware<AppState> _saveAuthUser(SettingsRepository settingsRepository) {
.then((user) {
store.dispatch(SaveAuthUserSuccess(user));
store.dispatch(UserVerifiedPassword());
action.completer.complete();
if (action.completer != null) {
action.completer.complete();
}
}).catchError((Object error) {
print(error);
store.dispatch(SaveAuthUserFailure(error));
if ('$error'.contains('412')) {
store.dispatch(UserUnverifiedPassword());
}
action.completer.completeError(error);
if (action.completer != null) {
action.completer.completeError(error);
}
});
next(action);

2
lib/ui/settings/user_details.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/user_model.dart';
import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
@ -13,7 +12,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart';
import 'package:invoiceninja_flutter/ui/app/forms/color_picker.dart';
import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
import 'package:invoiceninja_flutter/ui/app/forms/learn_more.dart';
import 'package:invoiceninja_flutter/ui/app/forms/notification_settings.dart';
import 'package:invoiceninja_flutter/ui/app/forms/password_field.dart';
import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';

30
lib/ui/settings/user_details_vm.dart
View File

@ -35,6 +35,8 @@ class UserDetailsVM {
@required this.state,
@required this.onChanged,
@required this.onSavePressed,
@required this.onDisconnectGooglePressed,
@required this.onDisableTwoFactorPressed,
});
static UserDetailsVM fromStore(Store<AppState> store) {
@ -44,6 +46,32 @@ class UserDetailsVM {
state: state,
user: state.uiState.settingsUIState.user,
onChanged: (user) => store.dispatch(UpdateUserSettings(user: user)),
onDisableTwoFactorPressed: (context) {
passwordCallback(
context: context,
callback: (password, idToken) {
store.dispatch(
SaveAuthUserRequest(
//user: state.user.rebuild((b) => b..oauthProvider = ''),
password: password,
idToken: idToken,
),
);
});
},
onDisconnectGooglePressed: (context) {
passwordCallback(
context: context,
callback: (password, idToken) {
store.dispatch(
SaveAuthUserRequest(
user: state.user.rebuild((b) => b..oauthProvider = ''),
password: password,
idToken: idToken,
),
);
});
},
onSavePressed: (context) {
final completer = snackBarCompleter<Null>(
context, AppLocalization.of(context).savedSettings);
@ -70,4 +98,6 @@ class UserDetailsVM {
final UserEntity user;
final Function(UserEntity) onChanged;
final Function(BuildContext) onSavePressed;
final Function(BuildContext) onDisconnectGooglePressed;
final Function(BuildContext) onDisableTwoFactorPressed;
}