Merge pull request #44 from matteobortolazzo/dev

Release 1.1.2

Author: Matteo Bortolazzo

CHANGELOG.md

@@ -1,4 +1,9 @@
-# 1.1.1 (2019-06-02)
+# 1.1.2 (2019-06-08)
+
+## Bug Fixes
+* **Client:** Prevent deadlocks when run against .NET Framework. ([#PR43](https://github.com/matteobortolazzo/couchdb-net/pull/43))
+
+# 1.1.1 (2019-06-02)
 
 ## Features
 * **Single/SingleOrDefault:** Methods implementated as composite supported methods (Where and Take(2)).

LATEST_CHANGE.md

@@ -1,6 +1,2 @@
-## Features
-* **Single/SingleOrDefault:** Methods implementated as composite supported methods (Where and Take(2)).
-
-## Bug Fixes
-* **Queries:** Implicit bools in nested methods. ([#PR41](https://github.com/matteobortolazzo/couchdb-net/pull/41))
-* **FxCopAnalyzers:** Removed from NuGet dependencies.
+## Bug Fixes
+* **Client:** Prevent deadlocks when run against .NET Framework. ([#PR43](https://github.com/matteobortolazzo/couchdb-net/pull/43))

README.md

@@ -297,6 +297,7 @@ var client = new CouchClient("http://localhost", s => s
 | SetDocumentCase                | Sets the format case for documents.           |
 | SetPropertyCase                | Sets the format case for properties.          |
 | EnsureDatabaseExists           | If a database doesn't exists, it creates it.  |
+| DisableLogOutOnDispose         | Disables log out on client dispose.           | 
 
 - **DocumentCaseTypes**: None, UnderscoreCase *(default)*, DashCase, KebabCase.
 - **PropertyCaseTypes**: None, CamelCase *(default)*, PascalCase, UnderscoreCase, DashCase, KebabCase.

src/CouchDB.Driver/CouchClient.cs

@@ -303,7 +303,10 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            AsyncContext.Run(() => LogoutAsync());
+            if (_settings.AuthenticationType == AuthenticationType.Cookie && _settings.LogOutOnDispose)
+            {
+                AsyncContext.Run(() => LogoutAsync().ConfigureAwait(false));
+            }
             _flurlClient.Dispose();
         }
 

src/CouchDB.Driver/Settings/CouchSettings.cs

@@ -23,6 +23,7 @@ public class CouchSettings
         internal DocumentCaseType DocumentsCaseType { get; private set; }
         internal PropertyCaseType PropertiesCase { get; private set; }
         internal bool CheckDatabaseExists { get; private set; }
+        internal bool LogOutOnDispose { get; private set; }
         internal Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateCustomValidationCallback { get; private set; }
 
         internal CouchSettings()
@@ -31,6 +32,7 @@ internal CouchSettings()
             PluralizeEntitis = true;
             DocumentsCaseType = DocumentCaseType.UnderscoreCase;
             PropertiesCase = PropertyCaseType.CamelCase;
+            LogOutOnDispose = true;
         }
 
         /// <summary>
@@ -144,5 +146,14 @@ public CouchSettings EnsureDatabaseExists()
             CheckDatabaseExists = true;
             return this;
         }
+        /// <summary>
+        /// Disables log out on client dispose. 
+        /// </summary>
+        /// <returns>The current settings</returns>
+        public CouchSettings DisableLogOutOnDispose()
+        {
+            LogOutOnDispose = false;
+            return this;
+        }
     }
 }