Do not return if session or cache is null

Author: TDroogers

Src/Drogecode.Blazor.ExpireStorage/Drogecode.Blazor.ExpireStorage.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Drogecode.Blazor.ExpireStorage</RootNamespace>
-    <Version>0.2.3</Version>
+    <Version>0.2.4</Version>
     <Title>Drogecode.Blazor.ExpireStorage</Title>
     <Authors>Taco Droogers</Authors>
     <PackageProjectUrl>https://github.com/Drogecode/Drogecode.Blazor.ExpireStorage</PackageProjectUrl>

Src/Drogecode.Blazor.ExpireStorage/Services/ExpireStorageService.cs

@@ -73,13 +73,19 @@ public ExpireStorageService(
             if ((request.CachedAndReplace || request.OneCallPerSession || (IsOffline && request.AlwaysCacheWhenOffline)) && !request.IgnoreCache)
             {
                 var sessionResult = await _sessionStorageExpireService.GetItemAsync<TRes>(cacheKey, clt);
-                return BuildResponse(sessionResult, HandledBy.Cache);
+                if (sessionResult is not null)
+                {
+                    return BuildResponse(sessionResult, HandledBy.Cache);
+                }
             }
 
             if ((request.CachedAndReplace || request.OneCallPerCache || (IsOffline && request.AlwaysCacheWhenOffline)) && !request.IgnoreCache)
             {
                 var cacheResult = await _localStorageExpireService.GetItemAsync<TRes?>(cacheKey, clt);
-                return BuildResponse(cacheResult, HandledBy.Cache);
+                if (cacheResult is not null)
+                {
+                    return BuildResponse(cacheResult, HandledBy.Cache);
+                }
             }
 
             if (!request.CachedAndReplace)

Tests/Drogecode.Blazor.ExpireStorage.Tests/Tests/Services/ExpireStorageServiceTests.cs

@@ -125,4 +125,13 @@ public async Task CancellationTokenTest()
 
         response.Should().BeNull();
     }
+
+    [Fact]
+    public async Task OneCallPerSessionTest()
+    {
+        const string cacheKey = "OneCallPerSessionTest";
+        var response = await _expireStorageService.CachedRequestAsync<string>(cacheKey, () => Task.FromResult("test"), new CachedRequest{OneCallPerSession = true, IgnoreCache = false, CachedAndReplace = false}, clt: TestContext.Current.CancellationToken);
+        Assert.NotNull(response);
+        response.Should().Be("test");
+    }
 }