Begin adding classes for auth

Author: mtranter

CypherNet.UnitTests/CypherSessionTransactionTests.cs

@@ -2,6 +2,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using System.Transactions;
+using CypherNet.Configuration;
 using CypherNet.Dynamic;
 using CypherNet.Graph;
 using CypherNet.Http;
@@ -29,7 +30,7 @@ public void CreateNode__CreatesNode()
         {
             var mock = InitializeMockWebClient(AutoCommitAddress);
 
-            var session = new CypherSession(BaseUri, mock.Object);
+            var session = new CypherSession(new ConnectionProperties(BaseUri), mock.Object);
             var node = session.CreateNode(new {name = Name}, "person");
             Assert.AreEqual(node.AsDynamic().name, Name);
             Assert.AreEqual((node).Labels.First(), "person");
@@ -47,7 +48,7 @@ public void CreateNode_WithinCommitedTransaction_CallsCommit()
             //Commit
             mock.Setup(m => m.PostAsync(CommitAddress, EmptyRequest)).Returns(() => BuildResponse(EmptyResponse));
 
-            var session = new CypherSession(BaseUri, mock.Object);
+            var session = new CypherSession(new ConnectionProperties(BaseUri), mock.Object);
             using (var ts = new TransactionScope())
             {
                 session.CreateNode(new {name = Name}, "person");
@@ -66,7 +67,7 @@ public void CreateNode_WithinRollbackTransaction_CallsRollback()
             //Rollback
             mock.Setup(m => m.DeleteAsync(KeepAliveAddress)).Returns(() => BuildResponse(EmptyResponse));
 
-            var session = new CypherSession(BaseUri, mock.Object);
+            var session = new CypherSession(new ConnectionProperties(BaseUri), mock.Object);
 
             using (new TransactionScope())
             {

CypherNet.sln.DotSettings

@@ -1,3 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

CypherNet/Configuration/Fluently.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Data.Common;
 using CypherNet.Logging;
 
 namespace CypherNet.Configuration
@@ -21,22 +23,42 @@ public static ISessionConfiguration Configure(string endpointUri)
 
     internal class SessionConfiguration : ISessionConfiguration
     {
-        private readonly string _endpointUri;
+        private readonly ConnectionProperties _connectionProperties;
 
-        public SessionConfiguration(string endpointUri)
+        public SessionConfiguration(string connectionString)
         {
-            _endpointUri = endpointUri;
+            _connectionProperties = Neo4JConnectionStringParser.Parse(connectionString);
             Logging.Logger.Current = new TraceLogger();
         }
 
         public ICypherSessionFactory CreateSessionFactory()
         {
-            return new DefaultCypherSessionFactory(_endpointUri);
+            return new DefaultCypherSessionFactory(_connectionProperties);
         }
     }
 
     public interface ISessionConfiguration
     {
         ICypherSessionFactory CreateSessionFactory();
     }
+
+    public class ConnectionProperties
+    {
+        public ConnectionProperties(string url): this(url, null, null)
+        {
+        }
+
+        public ConnectionProperties(string url, string username, string password)
+        {
+            Url = url;
+            Username = username;
+            Password = password;
+        }
+
+        public string Url { get; private set; }
+
+        public string Username { get; private set; }
+
+        public string Password { get; private set; }
+    }
 }

CypherNet/Configuration/Neo4JConnectionStringParser.cs

@@ -0,0 +1,29 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace CypherNet.Configuration
+{
+    internal class Neo4JConnectionStringParser
+    {
+        private readonly static Regex URL_REGEX = new Regex(@"https ?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)");
+
+        internal static ConnectionProperties Parse(string connectionString)
+        {
+            if (URL_REGEX.IsMatch(connectionString))
+            {
+                return new ConnectionProperties(connectionString, null, null);
+            }
+            var values = connectionString.Split(';')
+                .Select(s => s.Trim())
+                .Select(s => s.Split('='))
+                .ToDictionary(arr => arr[0].ToLower(), arr => arr[1]);
+
+            var server = values["server"];
+            string user, password;
+
+            values.TryGetValue("user id", out user);
+            values.TryGetValue("password", out password);
+            return new ConnectionProperties(server, user, password);
+        }
+    }
+}

CypherNet/CypherNet.csproj

@@ -51,6 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\Fluently.cs" />
+    <Compile Include="Configuration\Neo4JConnectionStringParser.cs" />
     <Compile Include="Dynamic\CachedDictionaryPropertiesProvider.cs" />
     <Compile Include="Dynamic\DynamicEntity.cs" />
     <Compile Include="Dynamic\IDynamicMetaData.cs" />
@@ -59,6 +60,7 @@
     <Compile Include="Graph\IGraphEntity.cs" />
     <Compile Include="Graph\Node.cs" />
     <Compile Include="Graph\Relationship.cs" />
+    <Compile Include="Http\BasicAuthCredentials.cs" />
     <Compile Include="Http\IWebClient.cs" />
     <Compile Include="Http\WebClient.cs" />
     <Compile Include="ICypherSession.cs" />

CypherNet/Http/BasicAuthCredentials.cs

@@ -0,0 +1,23 @@
+namespace CypherNet.Http
+{
+    using System;
+    using System.Text;
+
+    public class BasicAuthCredentials
+    {
+        public BasicAuthCredentials(string username, string password)
+        {
+            EncodedCredentials = EncodeCredentials(username, password);
+        }
+
+        public string EncodedCredentials { get; }
+
+        private static string EncodeCredentials(string username, string password)
+        {
+            var auth = string.Format("{0}:{1}", username, password);
+            var enc = Convert.ToBase64String(Encoding.ASCII.GetBytes(auth));
+            var cred = string.Format("{0} {1}", "Basic", enc);
+            return cred;
+        }
+    }
+}

CypherNet/Http/WebClient.cs

@@ -7,6 +7,17 @@ namespace CypherNet.Http
 {
     public class WebClient : IWebClient
     {
+        private readonly BasicAuthCredentials _credentials;
+
+        public WebClient()
+        {
+        }
+
+        public WebClient(BasicAuthCredentials credentials)
+        {
+            _credentials = credentials;
+        }
+
         #region IWebClient Members
 
         public async Task<IHttpResponseMessage> GetAsync(string url)
@@ -31,15 +42,9 @@ public async Task<IHttpResponseMessage> DeleteAsync(string url)
 
         #endregion
 
-        private async Task<IHttpResponseMessage> Execute(string url, HttpMethod method)
+        private Task<IHttpResponseMessage> Execute(string url, HttpMethod method)
         {
-            var msg = new HttpRequestMessage(method, url);
-
-            using (var client = new HttpClient())
-            {
-                var result = await client.SendAsync(msg).ConfigureAwait(false);
-                return new HttpResponseMessageWrapper(result);
-            }
+            return Execute(url, null, method);
         }
 
         private async Task<IHttpResponseMessage> Execute(string url, String content, HttpMethod method)
@@ -54,10 +59,14 @@ private async Task<IHttpResponseMessage> Execute(string url, String content, Htt
 
             using (var client = new HttpClient())
             {
+                if (_credentials != null)
+                {
+                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", _credentials.EncodedCredentials);
+                }
+
                 var result = await client.SendAsync(msg).ConfigureAwait(false);
                 return new HttpResponseMessageWrapper(result);
             }
         }
     }
-
 }

CypherNet/ICypherSessionFactory.cs

@@ -1,8 +1,10 @@
-namespace CypherNet
+using CypherNet.Configuration;
+
+namespace CypherNet
 {
     public interface ICypherSessionFactory
     {
         ICypherSession Create();
-        ICypherSession Create(string sourceUri);
+        ICypherSession Create(ConnectionProperties connectionProperties);
     }
 }

CypherNet/Transaction/CypherSession.cs

@@ -1,4 +1,6 @@
-namespace CypherNet.Transaction
+using CypherNet.Configuration;
+
+namespace CypherNet.Transaction
 {
     #region
 
@@ -40,14 +42,14 @@ public class CypherSession : ICypherSession
         private readonly IEntityCache _entityCache;
         private readonly IWebClient _webClient;
 
-        internal CypherSession(string uri)
-            : this(uri, new WebClient())
+        internal CypherSession(ConnectionProperties connectionProperties)
+            : this(connectionProperties, new WebClient(connectionProperties.BuildBasicAuthCredentials()))
         {
         }
 
-        internal CypherSession(string uri, IWebClient webClient)
+        internal CypherSession(ConnectionProperties connectionProperties, IWebClient webClient)
         {
-            _uri = uri;
+            _uri = connectionProperties.Url;
             _webClient = webClient;
             _entityCache = new DictionaryEntityCache();
             _webSerializer = new DefaultJsonSerializer(_entityCache);
@@ -266,4 +268,17 @@ public SingleNodeResult(Node newNode)
             public Node NewNode { get; private set; }
         }
     }
+
+    internal static class ConnectionPropertiesExtension
+    {
+        public static BasicAuthCredentials BuildBasicAuthCredentials(this ConnectionProperties connectionProperties)
+        {
+            if (!(new[] {connectionProperties.Username, connectionProperties.Password}.All(string.IsNullOrEmpty)))
+            {
+                return new BasicAuthCredentials(connectionProperties.Username, connectionProperties.Password);
+            }
+
+            return null;
+        }
+    }
 }

CypherNet/Transaction/DefaultCypherSessionFactory.cs

@@ -1,30 +1,32 @@
-using CypherNet.Serialization;
+
 
 namespace CypherNet.Transaction
 {
     #region
 
     using Http;
+    using CypherNet.Configuration;
+    using CypherNet.Serialization;
 
     #endregion
 
     internal class DefaultCypherSessionFactory : ICypherSessionFactory
     {
-        private readonly string _sourceUri;
+        private readonly ConnectionProperties _connectionProperties;
 
-        public DefaultCypherSessionFactory(string sourceUri)
+        public DefaultCypherSessionFactory(ConnectionProperties connectionProperties)
         {
-            _sourceUri = sourceUri;
+            _connectionProperties = connectionProperties;
         }
 
         public ICypherSession Create()
         {
-            return Create(_sourceUri);
+            return Create(_connectionProperties);
         }
 
-        public ICypherSession Create(string sourceUri)
+        public ICypherSession Create(ConnectionProperties connectionProperties)
         {
-            var session = new CypherSession(sourceUri);
+            var session = new CypherSession(connectionProperties);
             session.Connect();
             return session;
         }