Added support for mutual SSL auth

.gitignore

@@ -28,4 +28,5 @@ obj/
 _ReSharper*/
 [Tt]est[Rr]esult*
 *.orig
-LoveSeat.IntegrationTest/LoveSeat.IntegrationTest.pidb
+LoveSeat.IntegrationTest/LoveSeat.IntegrationTest.pidb
+packages/

LoveSeat.IntegrationTest/LoveSeat.IntegrationTest.csproj

@@ -39,9 +39,9 @@
     <Reference Include="Moq">
       <HintPath>..\Libraries\Moq\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -73,6 +73,7 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Files\martin.jpg" />

LoveSeat.IntegrationTest/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net35" />
+</packages>

LoveSeat.Interfaces/LoveSeat.Interfaces.csproj

@@ -38,11 +38,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

LoveSeat.Interfaces/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net35" />
+</packages>

LoveSeat.Repository/LoveSeat.Repositories.csproj

@@ -32,8 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\Libraries\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -54,6 +55,9 @@
       <Name>LoveSeat</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

LoveSeat.Repository/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net35" />
+</packages>

LoveSeat/CouchClient.cs

@@ -6,6 +6,8 @@
 
 namespace LoveSeat
 {
+    using LoveSeat.Interfaces;
+
     // type of authentication used in request to CouchDB
     public enum AuthenticationType
     { Basic, Cookie };
@@ -43,8 +45,8 @@ public CouchClient(string username, string password)
         /// <param name="port">The port of the CouchDB instance</param>
         /// <param name="username">The username of the CouchDB instance</param>Cou
         /// <param name="password">The password of the CouchDB instance</param>
-        public CouchClient(string host, int port, string username, string password, bool isHttps, AuthenticationType aT)
-            : base(username, password, aT)
+        public CouchClient(string host, int port, string username, string password, bool isHttps, AuthenticationType aT, IConfigWebRequest configWebRequest = null)
+            : base(username, password, aT, configWebRequest)
         {
             if (isHttps == false)
             {
@@ -119,7 +121,7 @@ public CouchResponseObject DeleteDatabase(string databaseName)
         /// <returns></returns>
         public CouchDatabase GetDatabase(string databaseName)
         {
-            return new CouchDatabase(baseUri, databaseName, username, password, this.authType);
+            return new CouchDatabase(baseUri, databaseName, username, password, this.authType, configWebRequest);
         }
 
         /// <summary>
@@ -198,7 +200,7 @@ public bool HasUser(string userId)
         /// <returns></returns>
         public Document GetUser(string userId)
         {
-            var db = new CouchDatabase(baseUri, "_users", username, password, this.authType);
+            var db = new CouchDatabase(baseUri, "_users", username, password, this.authType, configWebRequest);
             userId = "org.couchdb.user:" + HttpUtility.UrlEncode(userId);
             return db.GetDocument(userId);
         }

LoveSeat/CouchConfiguration.cs

@@ -4,6 +4,8 @@
 
 namespace LoveSeat
 {
+    using LoveSeat.Interfaces;
+
     public class CouchConfiguration
     {
         public CouchConfiguration()

LoveSeat/CouchDatabase.cs

@@ -17,8 +17,8 @@ public class CouchDatabase : CouchBase, IDocumentDatabase
 
         private readonly string databaseBaseUri;
         private string defaultDesignDoc = null;
-        internal CouchDatabase(string baseUri, string databaseName, string username, string password, AuthenticationType aT)
-            : base(username, password, aT)
+        internal CouchDatabase(string baseUri, string databaseName, string username, string password, AuthenticationType aT, IConfigWebRequest configWebRequest)
+            : base(username, password, aT, configWebRequest)
         {
             this.baseUri = baseUri;
             this.databaseBaseUri = baseUri + databaseName;
@@ -37,7 +37,7 @@ public CouchResponseObject CreateDocument(string id, string jsonForDocument)
             if (jobj.Value<object>("_rev") == null)
                 jobj.Remove("_rev");
             var resp = GetRequest(databaseBaseUri + "/" + id)
-                .Put().Form()
+                .Put().Json()
                 .Data(jobj.ToString(Formatting.None))
                 .GetCouchResponse();
             return
@@ -446,7 +446,7 @@ private CouchRequest GetRequest(ViewOptions options, string uri)
             if (options != null)
                 uri += options.ToString();
             CouchRequest request = GetRequest(uri, options == null ? null : options.Etag).Get().Json();
-            if (options.isAtKeysSizeLimit)
+            if (options != null && options.isAtKeysSizeLimit)
             {
                 // Encode the keys parameter in the request body and turn it into a POST request.
                 string keys = "{\"keys\": [" + String.Join(",", options.Keys.Select(k => k.ToRawString()).ToArray()) + "]}";

LoveSeat/CouchResponseObject.cs

@@ -7,6 +7,11 @@ namespace LoveSeat
     /// </summary>
     public class CouchResponseObject : JObject
     {
+        public CouchResponseObject()
+            : base()
+        {
+        }
+
         public CouchResponseObject(JObject obj)
             : base(obj)
         {

LoveSeat/Interfaces/IConfigWebRequest.cs

@@ -0,0 +1,14 @@
+namespace LoveSeat.Interfaces
+{
+    using System.Net;
+
+    public interface IConfigWebRequest
+    {
+        /// <summary>
+        /// Used to configure the web request created by LoveSeat. For example, to set things like
+        /// SSL settings.
+        /// </summary>
+        /// <param name="webRequest"></param>
+        void ConfigWebRequest(HttpWebRequest webRequest);
+    }
+}

LoveSeat/LoveSeat.csproj

@@ -51,9 +51,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -70,6 +70,7 @@
     <Compile Include="CouchResponseObject.cs" />
     <Compile Include="Document.cs" />
     <Compile Include="CouchUser.cs" />
+    <Compile Include="Interfaces\IConfigWebRequest.cs" />
     <Compile Include="Interfaces\IDocumentDatabase.cs" />
     <Compile Include="Interfaces\IKeyOptions.cs" />
     <Compile Include="Interfaces\IListResult.cs" />
@@ -119,6 +120,9 @@
       <Name>LoveSeat.Interfaces</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

LoveSeat/Support/CouchBase.cs

@@ -3,11 +3,16 @@
 
 namespace LoveSeat.Support
 {
+    using LoveSeat.Interfaces;
+
     public abstract class CouchBase
     {
         protected readonly string username;
         protected readonly string password;
         protected readonly AuthenticationType authType;
+
+        protected readonly IConfigWebRequest configWebRequest;
+
         protected string baseUri;
         private TtlDictionary<string, Cookie> cookiestore = new TtlDictionary<string, Cookie>();
         private int? timeout;
@@ -16,11 +21,12 @@ protected CouchBase()
         {
             throw new Exception("Should not be used.");
         }
-        protected CouchBase(string username, string password, AuthenticationType aT)
+        protected CouchBase(string username, string password, AuthenticationType aT, IConfigWebRequest configWebRequest = null)
         {
             this.username = username;
             this.password = password;
             this.authType = aT;
+            this.configWebRequest = configWebRequest;
         }
         public static bool Authenticate(string baseUri, string userName, string password)
         {
@@ -76,15 +82,15 @@ protected CouchRequest GetRequest(string uri, string etag)
             CouchRequest request;
             if (AuthenticationType.Cookie == this.authType)
             {
-                request = new CouchRequest(uri, GetSession(), etag);
+                request = new CouchRequest(uri, GetSession(), etag, configWebRequest);
             }
             else if (AuthenticationType.Basic == this.authType) //Basic Authentication
             {
-                request = new CouchRequest(uri, username, password);
+                request = new CouchRequest(uri, username, password, configWebRequest);
             }
             else //default Cookie
             {
-                request = new CouchRequest(uri, GetSession(), etag);
+                request = new CouchRequest(uri, GetSession(), etag, configWebRequest);
             }
             if (timeout.HasValue) request.Timeout(timeout.Value);
             return request;

LoveSeat/Support/CouchRequest.cs

@@ -6,6 +6,8 @@
 
 namespace LoveSeat.Support
 {
+    using LoveSeat.Interfaces;
+
     /// <summary>
     /// Repersent a web request for CouchDB database.
     /// </summary>
@@ -21,13 +23,14 @@ public CouchRequest(string uri)
         {
         }
 
+
         /// <summary>
         /// Request with Cookie authentication
         /// </summary>
         /// <param name="uri"></param>
         /// <param name="authCookie"></param>
         /// <param name="eTag"></param>
-        public CouchRequest(string uri, Cookie authCookie, string eTag)
+        public CouchRequest(string uri, Cookie authCookie, string eTag, IConfigWebRequest configWebRequest = null)
         {
             request = (HttpWebRequest)WebRequest.Create(uri);
             request.Headers.Clear(); //important
@@ -42,6 +45,10 @@ public CouchRequest(string uri, Cookie authCookie, string eTag)
             if (authCookie != null)
                 request.Headers.Add("Cookie", "AuthSession=" + authCookie.Value);
             request.Timeout = 10000;
+            if (configWebRequest != null)
+            {
+                configWebRequest.ConfigWebRequest(request);
+            }
         }
 
         /// <summary>
@@ -50,7 +57,7 @@ public CouchRequest(string uri, Cookie authCookie, string eTag)
         /// <param name="uri"></param>
         /// <param name="username"></param>
         /// <param name="password"></param>
-        public CouchRequest(string uri, string username, string password)
+        public CouchRequest(string uri, string username, string password, IConfigWebRequest configWebRequest = null)
         {
 
             request = (HttpWebRequest)WebRequest.Create(uri);
@@ -75,6 +82,10 @@ public CouchRequest(string uri, string username, string password)
             request.ContentType = "application/json";
             request.KeepAlive = true;
             request.Timeout = 10000;
+            if (configWebRequest != null)
+            {
+                configWebRequest.ConfigWebRequest(request);    
+            }
         }
 
 

LoveSeat/Support/CouchResponse.cs

@@ -35,7 +35,7 @@ public CouchResponse(HttpWebResponse response)
         /// <returns></returns>
         public CouchResponseObject GetJObject()
         {
-            var resp = new CouchResponseObject(JObject.Parse(responseString));
+            var resp = string.IsNullOrEmpty(responseString) ? new CouchResponseObject() : new CouchResponseObject(JObject.Parse(responseString));
             resp.StatusCode = (int)statusCode;
             return resp;
         }

LoveSeat/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net35" />
+</packages>