From 5864ab0dbc0048ba94efdf7376dbbc83bfe8d168 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 2 Dec 2025 16:10:06 +0100
Subject: [PATCH] Add security state support

---
 .../KeyManagement/Commands/SetAccountKeysForUserCommand.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Core/KeyManagement/Commands/SetAccountKeysForUserCommand.cs b/src/Core/KeyManagement/Commands/SetAccountKeysForUserCommand.cs
index 78d60fe1c1..6d2a3612f2 100644
--- a/src/Core/KeyManagement/Commands/SetAccountKeysForUserCommand.cs
+++ b/src/Core/KeyManagement/Commands/SetAccountKeysForUserCommand.cs
@@ -23,10 +23,12 @@ public class SetAccountKeysForUserCommand : ISetAccountKeysForUserCommand
         user.PrivateKey = accountKeysData.PublicKeyEncryptionKeyPairData.WrappedPrivateKey;
         user.PublicKey = accountKeysData.PublicKeyEncryptionKeyPairData.PublicKey;
         user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
-        await userRepository.ReplaceAsync(user);
         // Update the signature key pair data
-        if (accountKeysData.SignatureKeyPairData != null)
+        if (accountKeysData.SignatureKeyPairData != null && accountKeysData.SecurityStateData != null)
         {
+            user.SignedPublicKey = accountKeysData.PublicKeyEncryptionKeyPairData.SignedPublicKey;
+            user.SecurityState = accountKeysData.SecurityStateData.SecurityState;
+            user.SecurityVersion = accountKeysData.SecurityStateData.SecurityVersion;
             await userSignatureKeyPairRepository.UpsertAsync(new UserSignatureKeyPair
             {
                 Id = CoreHelpers.GenerateComb(),
@@ -38,5 +40,6 @@ public class SetAccountKeysForUserCommand : ISetAccountKeysForUserCommand
                 RevisionDate = DateTime.UtcNow,
             });
         }
+        await userRepository.ReplaceAsync(user);
     }
 }