Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Store signup keys before SRP setup

Neeraj Guptafb15bdc9d022
diff --git a/mobile/apps/photos/lib/services/account/user_service.dart b/mobile/apps/photos/lib/services/account/user_service.dart
index cbce2629f8..c29c114c8e 100644
--- a/mobile/apps/photos/lib/services/account/user_service.dart
+++ b/mobile/apps/photos/lib/services/account/user_service.dart
@@ -533,11 +533,16 @@ class UserService {
Future<void> setAttributes(KeyGenResult result) async {
try {
- await registerOrUpdateSrp(result.loginKey);
await _gateway.setKeyAttributes(result.keyAttributes);
await _config.setKey(result.privateKeyAttributes.key);
await _config.setSecretKey(result.privateKeyAttributes.secretKey);
await _config.setKeyAttributes(result.keyAttributes);
+ try {
+ await registerOrUpdateSrp(result.loginKey);
+ } catch (_) {
+ // Keys are stored; password reentry after OTT login retries SRP setup.
+ _logger.warning("Continuing signup after SRP setup failure");
+ }
} catch (e) {
_logger.severe(e);
rethrow;
diff --git a/mobile/packages/accounts/lib/services/user_service.dart b/mobile/packages/accounts/lib/services/user_service.dart
index 31d69073a4..bae19ea928 100644
--- a/mobile/packages/accounts/lib/services/user_service.dart
+++ b/mobile/packages/accounts/lib/services/user_service.dart
@@ -595,7 +595,6 @@ class UserService {
Future<void> setAttributes(KeyGenResult result) async {
try {
- await registerOrUpdateSrp(result.loginKey);
await _enteDio.put(
"/users/attributes",
data: {"keyAttributes": result.keyAttributes.toMap()},
@@ -603,6 +602,12 @@ class UserService {
await _config.setKey(result.privateKeyAttributes.key);
await _config.setSecretKey(result.privateKeyAttributes.secretKey);
await _config.setKeyAttributes(result.keyAttributes);
+ try {
+ await registerOrUpdateSrp(result.loginKey);
+ } catch (_) {
+ // Keys are stored; password reentry after OTT login retries SRP setup.
+ _logger.warning("Continuing signup after SRP setup failure");
+ }
} catch (e) {
_logger.severe(e);
rethrow;