0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle emailMFA flag during login

Browse source
This commit is contained in:
Neeraj Gupta 2023-08-02 13:16:48 +05:30
parent 58cf5ab4c3
commit 89774972f8
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/models/api/user/srp.dart
View file

@ -87,6 +87,7 @@ class SrpAttributes {
final int memLimit;
final int opsLimit;
final String kekSalt;
final bool emailMFA;
SrpAttributes({
required this.srpUserID,
@ -94,6 +95,7 @@ class SrpAttributes {
required this.memLimit,
required this.opsLimit,
required this.kekSalt,
required this.emailMFA,
});
factory SrpAttributes.fromMap(Map<String, dynamic> map) {
@ -103,6 +105,7 @@ class SrpAttributes {
memLimit: map['attributes']['memLimit'],
opsLimit: map['attributes']['opsLimit'],
kekSalt: map['attributes']['kekSalt'],
emailMFA: map['attributes']['emailMFA'],
);
}
}

20
lib/ui/account/login_page.dart
View file

@ -2,6 +2,7 @@ import 'package:email_validator/email_validator.dart';
import 'package:ente_auth/core/configuration.dart';
import 'package:ente_auth/core/errors.dart';
import "package:ente_auth/l10n/l10n.dart";
import 'package:ente_auth/models/api/user/srp.dart';
import 'package:ente_auth/services/user_service.dart';
import 'package:ente_auth/ui/account/login_pwd_verification_page.dart';
import 'package:ente_auth/ui/common/dynamic_fab.dart';
@ -61,22 +62,27 @@ class _LoginPageState extends State<LoginPage> {
buttonText: context.l10n.logInLabel,
onPressedFunction: () async {
UserService.instance.setEmail(_email!);
SrpAttributes? attr;
bool isEmailVerificationEnabled = true;
try {
final attr = await UserService.instance.getSrpAttributes(_email!);
attr = await UserService.instance.getSrpAttributes(_email!);
isEmailVerificationEnabled = attr.emailMFA;
} catch (e) {
if (e is! SrpSetupNotCompleteError) {
_logger.severe('Error getting SRP attributes', e);
}
}
if (attr != null && !isEmailVerificationEnabled) {
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) {
return LoginPasswordVerificationPage(
srpAttributes: attr,
srpAttributes: attr!,
);
},
),
);
}
catch (e) {
if(e is! SrpSetupNotCompleteError) {
_logger.warning('Error getting SRP attributes', e);
}
} else {
await UserService.instance
.sendOtt(context, _email!, isCreateAccountScreen: false);
}