Use config provider for device identifier

Reverts the switch to secure config provider made in b096d83.
btcpayserver · Mar 6, 2025 · 11981fd · 11981fd
1 parent 3f96a17
commit 11981fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs b/BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs
@@ -83,7 +83,7 @@ await WrapInLock(async () =>
             if (_cts.IsCancellationRequested)
                 return;
 
-            var deviceId = await secureProvider.GetDeviceIdentifier();
+            var deviceId = await configProvider.GetDeviceIdentifier();
             if (masterId is null && ConnectionState == BTCPayConnectionState.ConnectedAsSlave && !ForceSlaveMode)
             {
                 logger.LogInformation("OnMasterUpdated: Syncing slave {DeviceId}", deviceId);
@@ -117,7 +117,7 @@ await WrapInLock(async () =>
 
     private async Task OnConnectionChanged(object? sender, (BTCPayConnectionState Old, BTCPayConnectionState New) e)
     {
-        var deviceIdentifier = await secureProvider.GetDeviceIdentifier();
+        var deviceIdentifier = await configProvider.GetDeviceIdentifier();
         var newState = e.New;
         try
         {
@@ -316,7 +316,7 @@ protected override async Task ExecuteStopAsync(CancellationToken cancellationTok
         await _cts.CancelAsync();
         if (_connectionState == BTCPayConnectionState.ConnectedAsMaster)
         {
-            var deviceId = await secureProvider.GetDeviceIdentifier();
+            var deviceId = await configProvider.GetDeviceIdentifier();
             logger.LogInformation("Sending device master signal to turn off {DeviceId}", deviceId);
             await syncService.StopSync();
             await syncService.SyncToRemote(CancellationToken.None);
@@ -364,7 +364,7 @@ public async Task SwitchToSlave()
         if (_connectionState == BTCPayConnectionState.ConnectedAsMaster)
         {
             ForceSlaveMode = true;
-            var deviceId = await secureProvider.GetDeviceIdentifier();
+            var deviceId = await configProvider.GetDeviceIdentifier();
             logger.LogInformation("Sending device master signal to turn off {DeviceId}", deviceId);
             await syncService.StopSync();
             await syncService.SyncToRemote(CancellationToken.None);

diff --git a/BTCPayApp.Core/Backup/SyncService.cs b/BTCPayApp.Core/Backup/SyncService.cs
@@ -121,7 +121,7 @@ public async Task<bool> SetEncryptionKey(string key)
 
         await api.PutObjectAsync(new PutObjectRequest
         {
-            GlobalVersion = await secureConfigProvider.GetDeviceIdentifier(),
+            GlobalVersion = await configProvider.GetDeviceIdentifier(),
             TransactionItems =
             {
                 new KeyValue
@@ -327,7 +327,7 @@ public async Task SyncToRemote(CancellationToken cancellationToken = default)
 
             var putObjectRequest = new PutObjectRequest
             {
-                GlobalVersion = await secureConfigProvider.GetDeviceIdentifier()
+                GlobalVersion = await configProvider.GetDeviceIdentifier()
             };
             var outbox = await db.OutboxItems.GroupBy(outbox1 => outbox1.Key)
                 .ToListAsync(cancellationToken: cancellationToken);

diff --git a/BTCPayApp.Core/Helpers/ConfigExtensions.cs b/BTCPayApp.Core/Helpers/ConfigExtensions.cs
@@ -6,6 +6,8 @@ namespace BTCPayApp.Core.Helpers;
 public static class ConfigExtensions
 {
     private const string ConfigDeviceIdentifierKey = "deviceIdentifier";
+
+    /*
     public static async Task<long> GetDeviceIdentifier(this ISecureConfigProvider configProvider)
     {
         var id = await configProvider.Get<long>(ConfigDeviceIdentifierKey);
@@ -16,4 +18,10 @@ public static async Task<long> GetDeviceIdentifier(this ISecureConfigProvider co
         }
         return id;
     }
+    */
+
+    public static async Task<long> GetDeviceIdentifier(this ConfigProvider configProvider)
+    {
+        return await configProvider.GetOrSet(ConfigDeviceIdentifierKey, () => Task.FromResult(RandomUtils.GetInt64()), false);
+    }
 }