Fix password login profile handling

lib/backend/modules/account.dart

@@ -228,7 +228,9 @@ class AccountModule {
       throw Exception('completeRegistration: отсутствует id аккаунта');
     }
 
-    final profile = ProfileData.fromServerMap(contact.cast<dynamic, dynamic>());
+    final profile = ProfileData.fromServerProfile(
+      profileMap.cast<dynamic, dynamic>(),
+    );
     await AppDatabase.saveProfile(profile, isActive: true);
     await TokenStorage.setActiveAccount(accountId);
     await SpoofingService.commitPendingSpoof(accountId);
@@ -446,8 +448,25 @@ class AccountModule {
       throw Exception('checkPassword: отсутствует токен в ответе');
     }
 
+    final accountId = extractAccountId(data);
+    if (accountId == null) {
+      throw Exception('checkPassword: отсутствует accountId в ответе');
+    }
+
+    final profileMap = data['profile'];
+    if (profileMap is Map) {
+      final profile = ProfileData.fromServerProfile(
+        profileMap.cast<dynamic, dynamic>(),
+      );
+      await AppDatabase.saveProfile(profile, isActive: true);
+    }
+
+    await TokenStorage.saveToken(loginToken, accountId);
+    await TokenStorage.setActiveAccount(accountId);
+    await SpoofingService.commitPendingSpoof(accountId);
+
     logger.i('2FA пройдена, получен login-токен');
-    return TwoFactorResult(loginToken: loginToken);
+    return TwoFactorResult(loginToken: loginToken, accountId: accountId);
   }
 
   Map<dynamic, dynamic> buildLoginPayload(
@@ -500,16 +519,24 @@ class AccountModule {
       await TokenStorage.saveToken(updatedToken, accountId);
     }
 
+    ProfileData profile;
     final profileMap = data['profile'];
-    if (profileMap is! Map) {
-      throw Exception('login: отсутствует profile в ответе');
+    if (profileMap is Map) {
+      final contact = profileMap['contact'];
+      if (contact is! Map) {
+        throw Exception('login: отсутствует profile.contact в ответе');
+      }
+      profile = ProfileData.fromServerProfile(
+        profileMap.cast<dynamic, dynamic>(),
+      );
+      await AppDatabase.saveProfile(profile, isActive: true);
+    } else {
+      final cachedProfile = await AppDatabase.loadProfile(accountId);
+      if (cachedProfile == null) {
+        throw Exception('login: отсутствует profile в ответе');
+      }
+      profile = cachedProfile;
     }
-    final contact = profileMap['contact'];
-    if (contact is! Map) {
-      throw Exception('login: отсутствует profile.contact в ответе');
-    }
-    final profile = ProfileData.fromServerMap(contact.cast<dynamic, dynamic>());
-    await AppDatabase.saveProfile(profile, isActive: true);
     await AppDatabase.setActiveAccount(profile.id);
 
     await _saveSyncState(data, serverTime, profile.id);

lib/backend/modules/account/account_models.dart

@@ -372,8 +372,9 @@ class VerifyCodeResult {
 
 class TwoFactorResult {
   final String loginToken;
+  final int accountId;
 
-  const TwoFactorResult({required this.loginToken});
+  const TwoFactorResult({required this.loginToken, required this.accountId});
 }
 
 class LoginSyncParams {

lib/backend/modules/account/profile_module.dart

@@ -18,8 +18,8 @@ class ProfileModule extends AccountApiBase {
     if (profile == null) throw Exception('No profile in response');
     final contact = profile['contact'] as Map?;
     if (contact == null) throw Exception('No contact in response');
-    final newProfile = ProfileData.fromServerMap(
-      contact.cast<dynamic, dynamic>(),
+    final newProfile = ProfileData.fromServerProfile(
+      profile.cast<dynamic, dynamic>(),
     );
     await AppDatabase.saveProfile(newProfile, isActive: true);
     return newProfile;
@@ -88,7 +88,7 @@ class ProfileModule extends AccountApiBase {
           final contact = profile['contact'];
           if (contact is! Map) return;
           completer.complete(
-            ProfileData.fromServerMap(contact.cast<dynamic, dynamic>()),
+            ProfileData.fromServerProfile(profile.cast<dynamic, dynamic>()),
           );
         });
     final timer = Timer(const Duration(seconds: 15), () {