Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Make web app JsInterop more robust to prevent race conditions

Leendert de Borst6a3e294aaeab
diff --git a/apps/server/AliasVault.Client/Main/Components/ClipboardCountdownBar.razor b/apps/server/AliasVault.Client/Main/Components/ClipboardCountdownBar.razor
index bef34600d..4562c0fb1 100644
--- a/apps/server/AliasVault.Client/Main/Components/ClipboardCountdownBar.razor
+++ b/apps/server/AliasVault.Client/Main/Components/ClipboardCountdownBar.razor
@@ -2,7 +2,7 @@
@inject JsInteropService JsInteropService
@inject IStringLocalizerFactory LocalizerFactory
@using Microsoft.Extensions.Localization
-@implements IDisposable
+@implements IAsyncDisposable
@using Microsoft.JSInterop
@if (IsVisible)
@@ -84,7 +84,7 @@
}
/// <inheritdoc />
- public async void Dispose()
+ public async ValueTask DisposeAsync()
{
ClipboardCopyService.OnTimerProgress -= HandleTimerProgress;
@@ -92,6 +92,7 @@
{
await JsInteropService.UnregisterClipboardStatusCallback();
_objRef.Dispose();
+ _objRef = null;
}
}
diff --git a/apps/server/AliasVault.Client/wwwroot/js/utilities.js b/apps/server/AliasVault.Client/wwwroot/js/utilities.js
index 1b7f4e338..d52807085 100644
--- a/apps/server/AliasVault.Client/wwwroot/js/utilities.js
+++ b/apps/server/AliasVault.Client/wwwroot/js/utilities.js
@@ -74,7 +74,13 @@ window.clipboardManager = {
// Notify Blazor of status change
notifyStatusChange: function(status) {
if (this.statusCallback) {
- this.statusCallback.invokeMethodAsync('OnClipboardStatusChange', status);
+ try {
+ this.statusCallback.invokeMethodAsync('OnClipboardStatusChange', status);
+ } catch (error) {
+ if (error.message && error.message.includes('tracked object')) {
+ this.statusCallback = null;
+ }
+ }
}
},