Ic added rest client factory

src/Intercom.Tests.Integration/Intercom.Tests.Integration.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Intercom.Tests/Clients/AdminClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -20,7 +21,9 @@ public class AdminClientTest : TestBase
         public AdminClientTest()
             : base()
         {
-            this.adminsClient = new AdminsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            adminsClient = new AdminsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/AdminConversationsClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -20,7 +21,9 @@ public class AdminConversationsClientTest  : TestBase
 
         public AdminConversationsClientTest()
         {
-            this.adminConversationsClient = new AdminConversationsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            adminConversationsClient = new AdminConversationsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/CompanyClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -19,7 +20,9 @@ public class CompanyClientTest : TestBase
 
         public CompanyClientTest()
         {
-            this.companyClient = new CompanyClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            companyClient = new CompanyClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/ContactClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -20,7 +21,9 @@ public class ContactClientTest : TestBase
         public ContactClientTest()
             : base()
         {
-            this.contactsClient = new ContactsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            contactsClient = new ContactsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/ConversationsClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -19,7 +20,9 @@ public class ConversationsClientTest  : TestBase
 
         public ConversationsClientTest()
         {
-            this.conversationsClient = new ConversationsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            conversationsClient = new ConversationsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/EventsClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -19,7 +20,9 @@ public class EventsClientTest : TestBase
 
         public EventsClientTest()
         {
-            this.eventsClient = new EventsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            eventsClient = new EventsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/NotesClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -19,7 +20,9 @@ public class NotesClientTest : TestBase
 
         public NotesClientTest()
         {
-            this.notesClient = new NotesClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            notesClient = new NotesClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/TagsClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Core;
 using Intercom.Data;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using Moq;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -19,7 +20,9 @@ public class TagsClientTest : TestBase
 
         public TagsClientTest()
         {
-            this.tagsClient = new TagsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            tagsClient = new TagsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Clients/UserClientTest.cs

@@ -1,9 +1,11 @@
 using NUnit.Framework;
 using System;
+using System.Net;
 using Intercom.Core;
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -17,39 +19,71 @@ public class UserClientTest  : TestBase
     {
         private UsersClient usersClient;
 
-        public UserClientTest()
+        public UserClientTest() { }
+
+        private void SetupMock(RestClient restClient = null)
         {
-            this.usersClient = new UsersClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            if (restClient == null)
+            {
+                var restClientMock = new Mock<RestClient>();
+                restClient = restClientMock.Object;
+            }
+            var restClientFactoryMock = new Mock<RestClientFactory>(new object[] { auth });
+            restClientFactoryMock.Setup(x => x.RestClient).Returns(restClient);
+            var restClientFactory = restClientFactoryMock.Object;
+            usersClient = new UsersClient(restClientFactory);
         }
 
         [Test()]
         public void Create_WithNull_ThrowException()
         {
+            SetupMock();
             Assert.Throws<ArgumentNullException>(() => usersClient.Create(null));
         }
 
         [Test()]
         public void Create_NoUserIdOrEmail_ThrowException()
         {
+            SetupMock();
             Assert.Throws<ArgumentException>(() => usersClient.Create(new User()));
         }
 
         [Test()]
         public void Archive_NoIdOrUserIdOrEmail_ThrowException()
         {
+            SetupMock();
             Assert.Throws<ArgumentException>(() => usersClient.Archive(new User()));
         }
 
         [Test()]
         public void PermanentlyDeleteUser_NoId_ThrowException()
         {
+            SetupMock();
             Assert.Throws<ArgumentNullException>(() => usersClient.PermanentlyDeleteUser(null));
         }
 
         [Test()]
         public void Update_NoIdOrUserIdOrEmail_ThrowException()
         {
+            SetupMock();
             Assert.Throws<ArgumentException>(() => usersClient.Update(new User()));
         }
+
+        [Test()]
+        public void View_ByStringId_ReturnsObjectAsExpected()
+        {
+            var userId = "id";
+            var restClientMock = new Mock<RestClient>();
+            var restResponse = new RestResponse()
+            {
+                StatusCode = HttpStatusCode.OK,
+                Content = $"{{ \"type\": \"user\", \"id\": \"530370b477ad7120001d\", \"user_id\": \"{userId}\", \"email\": \"[email protected]\" }}",
+            };
+            restClientMock.Setup(x => x.Execute(It.IsAny<IRestRequest>())).Returns(restResponse);
+            var restClient = restClientMock.Object;
+            SetupMock(restClient);
+            Assert.AreEqual(userId, usersClient.View(userId).user_id);
+        }
     }
 }

src/Intercom.Tests/Clients/UserConversationsClientTest.cs

@@ -4,6 +4,7 @@
 using Intercom.Data;
 using Intercom.Clients;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 using System.Collections.Generic;
@@ -19,7 +20,9 @@ public class UserConversationsClientTest  : TestBase
 
         public UserConversationsClientTest()
         {
-            this.userConversationsClient = new UserConversationsClient(new Authentication(AppId, AppKey));
+            var auth = new Authentication(AppId, AppKey);
+            var restClientFactory = new RestClientFactory(auth);
+            userConversationsClient = new UserConversationsClient(restClientFactory);
         }
 
         [Test()]

src/Intercom.Tests/Intercom.Tests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Intercom/Clients/AdminConversationsClient.cs

@@ -6,6 +6,7 @@
 using Intercom.Core;
 using Intercom.Data;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 
@@ -17,13 +18,8 @@ public class AdminConversationsClient: Client
         private const String MESSAGES_RESOURCE = "messages";
         private const String REPLY_RESOURCE = "reply";
 
-        public AdminConversationsClient(Authentication authentication)
-            : base(INTERCOM_API_BASE_URL, CONVERSATIONS_RESOURCE, authentication)
-        {
-        }
-
-        public AdminConversationsClient(String intercomApiUrl, Authentication authentication)
-            : base(String.IsNullOrEmpty(intercomApiUrl) ? INTERCOM_API_BASE_URL : intercomApiUrl, CONVERSATIONS_RESOURCE, authentication)
+        public AdminConversationsClient(RestClientFactory restClientFactory)
+            : base(CONVERSATIONS_RESOURCE, restClientFactory)
         {
         }
 

src/Intercom/Clients/AdminsClient.cs

@@ -6,6 +6,7 @@
 using Intercom.Core;
 using Intercom.Data;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 
@@ -15,13 +16,8 @@ public class AdminsClient : Client
     {
         private const String ADMINS_RESOURCE = "admins";
 
-        public AdminsClient (Authentication authentication)
-            : base (INTERCOM_API_BASE_URL, ADMINS_RESOURCE, authentication)
-        {
-        }
-
-        public AdminsClient(String intercomApiUrl, Authentication authentication)
-            : base(String.IsNullOrEmpty(intercomApiUrl) ? INTERCOM_API_BASE_URL : intercomApiUrl, ADMINS_RESOURCE, authentication)
+        public AdminsClient (RestClientFactory restClientFactory)
+            : base (ADMINS_RESOURCE, restClientFactory)
         {
         }
 

src/Intercom/Clients/CompanyClient.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Intercom.Core;
 using Intercom.Data;
+using Intercom.Factories;
 using Newtonsoft.Json;
 
 namespace Intercom.Clients
@@ -13,13 +14,8 @@ public class CompanyClient : Client
     {
         private const String COMPANIES_RESOURCE = "companies";
 
-        public CompanyClient(Authentication authentication)
-            : base(INTERCOM_API_BASE_URL, COMPANIES_RESOURCE, authentication)
-        {
-        }
-
-        public CompanyClient(String intercomApiUrl, Authentication authentication)
-            : base(String.IsNullOrEmpty(intercomApiUrl) ? INTERCOM_API_BASE_URL : intercomApiUrl, COMPANIES_RESOURCE, authentication)
+        public CompanyClient(RestClientFactory restClientFactory)
+            : base(COMPANIES_RESOURCE, restClientFactory)
         {
         }
 

src/Intercom/Clients/ContactsClient.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Intercom.Core;
 using Intercom.Data;
+using Intercom.Factories;
 using Newtonsoft.Json;
 
 namespace Intercom.Clients
@@ -19,13 +20,8 @@ public static class ContactSortBy
 
         private const String CONTACTS_RESOURCE = "contacts";
 
-        public ContactsClient (Authentication authentication)
-            : base (INTERCOM_API_BASE_URL, CONTACTS_RESOURCE, authentication)
-        {
-        }
-
-        public ContactsClient(String intercomApiUrl, Authentication authentication)
-            : base(String.IsNullOrEmpty(intercomApiUrl) ? INTERCOM_API_BASE_URL : intercomApiUrl, CONTACTS_RESOURCE, authentication)
+        public ContactsClient (RestClientFactory restClientFactory)
+            : base (CONTACTS_RESOURCE, restClientFactory)
         {
         }
 

src/Intercom/Clients/ConversationsClient.cs

@@ -6,6 +6,7 @@
 using Intercom.Core;
 using Intercom.Data;
 using Intercom.Exceptions;
+using Intercom.Factories;
 using RestSharp;
 using RestSharp.Authenticators;
 
@@ -24,13 +25,8 @@ public static class MessageType
 
         private const String CONVERSATIONS_RESOURCE = "conversations";
 
-        public ConversationsClient( Authentication authentication)
-            : base(INTERCOM_API_BASE_URL, CONVERSATIONS_RESOURCE, authentication)
-        {
-        }
-
-        public ConversationsClient(String intercomApiUrl, Authentication authentication)
-            : base(String.IsNullOrEmpty(intercomApiUrl) ? INTERCOM_API_BASE_URL : intercomApiUrl, CONVERSATIONS_RESOURCE, authentication)
+        public ConversationsClient( RestClientFactory restClientFactory)
+            : base(CONVERSATIONS_RESOURCE, restClientFactory)
         {
         }