Merge pull request #201 from AdrianJSClark/200-always-use-cookies-fro…

…m-cookiecontainer Use Cookies Even Without "RestoreCookies"
AdrianJSClark · Apr 20, 2024 · 253bcdf · 253bcdf
2 parents c476296 + 0d873a6
commit 253bcdf
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/src/Aydsko.iRacingData.UnitTests/CookiePersistenceTests.cs b/src/Aydsko.iRacingData.UnitTests/CookiePersistenceTests.cs
@@ -97,4 +97,35 @@ public async Task GivenOptionsWithARestoreFuncTheFuncIsCalledToGetTheCookiesAsyn
         Assert.That(cookies, Has.One.Property(nameof(Cookie.Name)).EqualTo("irsso_members"));
         Assert.That(cookies, Has.One.Property(nameof(Cookie.Name)).EqualTo("authtoken_members"));
     }
+
+    [Test]
+    public async Task GivenACookieContainerWithCookiesAndNoRestoreOrSaveFunctionsThenTheCookiesAreUsed()
+    {
+        CookieContainer.Add(new Cookie("irsso_members", "one", "/", "members-ng.iracing.com"));
+        CookieContainer.Add(new Cookie("authtoken_members", "two", "/", "members-ng.iracing.com"));
+
+        var options = new iRacingDataClientOptions
+        {
+            Username = "[email protected]",
+            Password = "SuperSecretPassword",
+            RestoreCookies = null,
+            SaveCookies = null,
+        };
+
+        using var sut = new DataClient(HttpClient,
+                                       new TestLogger<DataClient>(),
+                                       options,
+                                       CookieContainer);
+
+        await MessageHandler.QueueResponsesAsync(nameof(CapturedResponseValidationTests.GetLookupsSuccessfulAsync), false).ConfigureAwait(false);
+        await sut.GetLookupsAsync(CancellationToken.None).ConfigureAwait(false);
+
+        Assert.That(sut.IsLoggedIn, Is.True);
+
+        var cookies = CookieContainer.GetAllCookies();
+
+        Assert.That(cookies, Has.Count.EqualTo(2));
+        Assert.That(cookies, Has.One.Property(nameof(Cookie.Name)).EqualTo("irsso_members"));
+        Assert.That(cookies, Has.One.Property(nameof(Cookie.Name)).EqualTo("authtoken_members"));
+    }
 }
diff --git a/src/Aydsko.iRacingData/DataClient.cs b/src/Aydsko.iRacingData/DataClient.cs
@@ -1869,14 +1869,14 @@ private async Task LoginInternalAsync(CancellationToken cancellationToken)
                 && options.RestoreCookies() is CookieCollection savedCookies)
             {
                 cookieContainer.Add(savedCookies);
+            }
 
-                // Assume we're logged in if we have cookies for our target domain
-                if (cookieContainer.GetCookies(new Uri("https://members-ng.iracing.com")).Count > 0)
-                {
-                    IsLoggedIn = true;
-                    logger.LoginCookiesRestored(options.Username!);
-                    return;
-                }
+            // Assume we're logged in if we have cookies for our target domain
+            if (cookieContainer.GetCookies(new Uri("https://members-ng.iracing.com")).Count > 0)
+            {
+                IsLoggedIn = true;
+                logger.LoginCookiesRestored(options.Username!);
+                return;
             }
 
             string? encodedHash = null;