Update locking

Nexus-Mods · Sep 25, 2023 · 967b650 · 967b650
1 parent d2a6be0
commit 967b650
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Networking/NexusMods.Networking.NexusWebApi.NMA/LoginManager.cs b/src/Networking/NexusMods.Networking.NexusWebApi.NMA/LoginManager.cs
@@ -76,8 +76,9 @@ public LoginManager(Client client,
         var cachedValue = _cachedUserInfo.Get();
         if (cachedValue is not null) return cachedValue;
 
-        using var waiter = _verifySemaphore.CustomWait(timeout: TimeSpan.FromSeconds(30), cancellationToken);
-        if (!waiter.HasEntered) return null;
+        using var waiter = _verifySemaphore.CustomWait(cancellationToken);
+        cachedValue = _cachedUserInfo.Get();
+        if (cachedValue is not null) return cachedValue;
 
         var isAuthenticated = await _msgFactory.IsAuthenticated();
         if (!isAuthenticated) return null;

diff --git a/src/NexusMods.Common/SemaphoreSlimWaiter.cs b/src/NexusMods.Common/SemaphoreSlimWaiter.cs
@@ -47,4 +47,15 @@ public static SemaphoreSlimWaiter CustomWait(
         var entered = semaphoreSlim.Wait(timeout, cancellationToken);
         return new SemaphoreSlimWaiter(semaphoreSlim, entered);
     }
+
+    /// <summary>
+    /// Custom wait infinitely using <see cref="SemaphoreSlimWaiter"/>.
+    /// </summary>
+    public static SemaphoreSlimWaiter CustomWait(
+        this SemaphoreSlim semaphoreSlim,
+        CancellationToken cancellationToken = default)
+    {
+        semaphoreSlim.Wait(cancellationToken);
+        return new SemaphoreSlimWaiter(semaphoreSlim, entered: true);
+    }
 }