[CommCoreModule][native_rust_library] move constants to one place

Summary:
Part of [ENG-9656](https://linear.app/comm/issue/ENG-9656/native-changes-for-minimal-version-of-backup)

I'm not sure why it was previously defined in two places. It makes it hard to maintain, so I'm cleaning this up. I added the missing comment.

Depends on D13937

Test Plan: Tested creating backup and secondary device login

Reviewers: bartek, tomek

Reviewed By: bartek

Subscribers: ashoat

Differential Revision: https://phab.comm.dev/D14000

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

@@ -33,12 +33,7 @@ std::string SQLiteQueryExecutor::sqliteFilePath;
 std::string SQLiteQueryExecutor::encryptionKey;
 std::once_flag SQLiteQueryExecutor::initialized;
 int SQLiteQueryExecutor::sqlcipherEncryptionKeySize = 64;
-// Should match constant defined in `native_rust_library/src/constants.rs`
-std::string SQLiteQueryExecutor::secureStoreEncryptionKeyID =
-    "comm.encryptionKey";
 int SQLiteQueryExecutor::backupLogsEncryptionKeySize = 32;
-std::string SQLiteQueryExecutor::secureStoreBackupLogsEncryptionKeyID =
-    "comm.backupLogsEncryptionKey";
 std::string SQLiteQueryExecutor::backupLogsEncryptionKey;
 
 #ifndef EMSCRIPTEN
@@ -2977,10 +2972,9 @@ void SQLiteQueryExecutor::initialize(std::string &databasePath) {
   std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
     SQLiteQueryExecutor::sqliteFilePath = databasePath;
     folly::Optional<std::string> maybeEncryptionKey =
-        CommSecureStore::get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);
+        CommSecureStore::get(CommSecureStore::encryptionKey);
     folly::Optional<std::string> maybeBackupLogsEncryptionKey =
-        CommSecureStore::get(
-            SQLiteQueryExecutor::secureStoreBackupLogsEncryptionKeyID);
+        CommSecureStore::get(CommSecureStore::backupLogsEncryptionKey);
 
     if (file_exists(databasePath) && maybeEncryptionKey &&
         maybeBackupLogsEncryptionKey) {
@@ -3135,8 +3129,7 @@ void SQLiteQueryExecutor::createMainCompaction(std::string backupID) const {
 void SQLiteQueryExecutor::generateFreshEncryptionKey() {
   std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
       SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
-  CommSecureStore::set(
-      SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
+  CommSecureStore::set(CommSecureStore::encryptionKey, encryptionKey);
   SQLiteQueryExecutor::encryptionKey = encryptionKey;
   SQLiteQueryExecutor::generateFreshBackupLogsEncryptionKey();
 }
@@ -3146,8 +3139,7 @@ void SQLiteQueryExecutor::generateFreshBackupLogsEncryptionKey() {
       comm::crypto::Tools::generateRandomHexString(
           SQLiteQueryExecutor::backupLogsEncryptionKeySize);
   CommSecureStore::set(
-      SQLiteQueryExecutor::secureStoreBackupLogsEncryptionKeyID,
-      backupLogsEncryptionKey);
+      CommSecureStore::backupLogsEncryptionKey, backupLogsEncryptionKey);
   SQLiteQueryExecutor::backupLogsEncryptionKey = backupLogsEncryptionKey;
 }
 

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

@@ -29,9 +29,7 @@ class SQLiteQueryExecutor : public DatabaseQueryExecutor {
 
   static std::once_flag initialized;
   static int sqlcipherEncryptionKeySize;
-  static std::string secureStoreEncryptionKeyID;
   static int backupLogsEncryptionKeySize;
-  static std::string secureStoreBackupLogsEncryptionKeyID;
   static std::string backupLogsEncryptionKey;
 
 #ifndef EMSCRIPTEN

native/cpp/CommonCpp/Tools/CommSecureStore.h

@@ -10,9 +10,13 @@ class CommSecureStore {
 public:
   static void set(const std::string key, const std::string value);
   static folly::Optional<std::string> get(const std::string key);
+  // Should match constant defined in `native_rust_library/src/constants.rs`
   inline static const std::string commServicesAccessToken = "accessToken";
   inline static const std::string userID = "userID";
   inline static const std::string deviceID = "deviceID";
+  inline static const std::string encryptionKey = "comm.encryptionKey";
+  inline static const std::string backupLogsEncryptionKey =
+      "comm.backupLogsEncryptionKey";
 };
 
 } // namespace comm

native/native_rust_library/src/constants.rs

@@ -12,7 +12,6 @@ pub mod secure_store {
   pub const COMM_SERVICES_ACCESS_TOKEN: &str = "accessToken";
   pub const USER_ID: &str = "userID";
   pub const DEVICE_ID: &str = "deviceID";
-  /// Should match constant defined in `SQLiteQueryExecutor.h`
   pub const SECURE_STORE_ENCRYPTION_KEY_ID: &str = "comm.encryptionKey";
   pub const SECURE_STORE_BACKUP_LOGS_ENCRYPTION_KEY_ID: &str =
     "comm.backupLogsEncryptionKey";