Update(s)

gonace · Jun 27, 2023 · 543d982 · 543d982
1 parent 0e9e757
commit 543d982
Show file tree

Hide file tree

Showing 38 changed files with 283 additions and 223 deletions.
diff --git a/Intercom/Abstractions/BaseClient.cs b/Intercom/Abstractions/BaseClient.cs
@@ -1,4 +1,5 @@
-using Intercom.Exceptions;
+using Intercom.Constants;
+using Intercom.Exceptions;
 using Intercom.Extensions;
 using Newtonsoft.Json;
 using System;
@@ -15,12 +16,12 @@ public abstract class BaseClient<T>
         private readonly string _bearerToken;
         private readonly string _apiVersion;
 
-        protected BaseClient(string baseUri, string bearerToken, Version apiVersion)
+        protected BaseClient(Url url, string bearerToken, Constants.Version version)
         {
-            _baseUri = new Uri(baseUri);
+            _baseUri = new Uri(url.Value);
 
             _bearerToken = bearerToken;
-            _apiVersion = apiVersion.ToString(2);
+            _apiVersion = version.Value.ToString(2);
         }
 
         public TReturn Get<TReturn>(PlainRequest req) =>

diff --git a/Intercom/Clients/AdminsClient.cs b/Intercom/Clients/AdminsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Admins;
 using Intercom.Responses.Admins;
@@ -18,13 +19,13 @@ public interface IAdminsClient
 
     public class AdminsClient : BaseClient<AdminsClient>, IAdminsClient
     {
-        public AdminsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public AdminsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public AdminsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public AdminsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/ArticlesClient.cs b/Intercom/Clients/ArticlesClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Articles;
 using Intercom.Responses.Articles;
@@ -23,13 +24,13 @@ public interface IArticlesClient
 
     public class ArticlesClient : BaseClient<ArticlesClient>, IArticlesClient
     {
-        public ArticlesClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public ArticlesClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public ArticlesClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public ArticlesClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/AttributesClient.cs b/Intercom/Clients/AttributesClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Attributes;
 using Intercom.Responses.Attributes;
@@ -18,13 +19,13 @@ public interface IAttributesClient
 
     public class AttributesClient : BaseClient<AttributesClient>, IAttributesClient
     {
-        public AttributesClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public AttributesClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public AttributesClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public AttributesClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Companies/ContactsClient.cs b/Intercom/Clients/Companies/ContactsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Companies.Contacts;
 using Intercom.Responses.Contacts;
@@ -20,16 +21,16 @@ public interface IContactsClient
 
     internal class ContactsClient : BaseClient<ContactsClient>, IContactsClient
     {
-        public ContactsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public ContactsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
-            Companies = new Contacts.CompaniesClient(baseUri, bearerToken, apiVersion);
+            Companies = new Contacts.CompaniesClient(url, bearerToken, version);
         }
 
-        public ContactsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public ContactsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
-            Companies = new Contacts.CompaniesClient(baseUri, bearerToken);
+            Companies = new Contacts.CompaniesClient(url, bearerToken);
         }
 
         public ListResponse List(ListRequest request)

diff --git a/Intercom/Clients/Companies/SegmentsClient.cs b/Intercom/Clients/Companies/SegmentsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Companies.Segments;
 using Intercom.Responses.Segments;
 using System.Threading.Tasks;
@@ -13,13 +14,13 @@ public interface ISegmentsClient
 
     internal class SegmentsClient : BaseClient<SegmentsClient>, ISegmentsClient
     {
-        public SegmentsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public SegmentsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public SegmentsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public SegmentsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/CompaniesClient.cs b/Intercom/Clients/CompaniesClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Companies;
 using Intercom.Responses.Companies;
@@ -27,18 +28,18 @@ public interface ICompaniesClient
 
     public class CompaniesClient : BaseClient<CompaniesClient>, ICompaniesClient
     {
-        public CompaniesClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public CompaniesClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
-            Contacts = new Companies.ContactsClient(baseUri, bearerToken, apiVersion);
-            Segments = new Companies.SegmentsClient(baseUri, bearerToken, apiVersion);
+            Contacts = new Companies.ContactsClient(url, bearerToken, version);
+            Segments = new Companies.SegmentsClient(url, bearerToken, version);
         }
 
-        public CompaniesClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public CompaniesClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
-            Contacts = new Companies.ContactsClient(baseUri, bearerToken);
-            Segments = new Companies.SegmentsClient(baseUri, bearerToken);
+            Contacts = new Companies.ContactsClient(url, bearerToken);
+            Segments = new Companies.SegmentsClient(url, bearerToken);
         }
 
         public Company Find(FindRequest request)

diff --git a/Intercom/Clients/Contacts/CompaniesClient.cs b/Intercom/Clients/Contacts/CompaniesClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Contacts.Companies;
 using Intercom.Responses.Companies;
 using System.Threading.Tasks;
@@ -13,13 +14,13 @@ public interface ICompaniesClient
 
     internal class CompaniesClient : BaseClient<CompaniesClient>, ICompaniesClient
     {
-        public CompaniesClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public CompaniesClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public CompaniesClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public CompaniesClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Contacts/NotesClient.cs b/Intercom/Clients/Contacts/NotesClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Contacts.Notes;
 using Intercom.Responses.Contacts.Notes;
@@ -16,13 +17,13 @@ public interface INotesClient
 
     internal class NotesClient : BaseClient<NotesClient>, INotesClient
     {
-        public NotesClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public NotesClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public NotesClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public NotesClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Contacts/SegmentsClient.cs b/Intercom/Clients/Contacts/SegmentsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Contacts.Segments;
 using Intercom.Responses.Contacts.Segments;
 using System.Threading.Tasks;
@@ -13,13 +14,13 @@ public interface ISegmentsClient
 
     internal class SegmentsClient : BaseClient<SegmentsClient>, ISegmentsClient
     {
-        public SegmentsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public SegmentsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public SegmentsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public SegmentsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Contacts/SubscriptionsClient.cs b/Intercom/Clients/Contacts/SubscriptionsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Contacts.Subscriptions;
 using Intercom.Responses.Subscriptions;
@@ -19,13 +20,13 @@ public interface ISubscriptionClient
 
     internal class SubscriptionsClient : BaseClient<SubscriptionsClient>, ISubscriptionClient
     {
-        public SubscriptionsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public SubscriptionsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public SubscriptionsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public SubscriptionsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Contacts/TagsClient.cs b/Intercom/Clients/Contacts/TagsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Contacts.Tags;
 using Intercom.Responses.Contacts.Tags;
 using Intercom.Responses.Tags;
@@ -19,13 +20,13 @@ public interface ITagsClient
 
     internal class TagsClient : BaseClient<TagsClient>, ITagsClient
     {
-        public TagsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public TagsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public TagsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public TagsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/ContactsClient.cs b/Intercom/Clients/ContactsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Models;
 using Intercom.Requests.Contacts;
 using Intercom.Responses.Contacts;
@@ -34,24 +35,24 @@ public interface IContactsClient
 
     public class ContactsClient : BaseClient<ContactsClient>, IContactsClient
     {
-        public ContactsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public ContactsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
-            Companies = new Contacts.CompaniesClient(baseUri, bearerToken, apiVersion);
-            Notes = new Contacts.NotesClient(baseUri, bearerToken, apiVersion);
-            Segments = new Contacts.SegmentsClient(baseUri, bearerToken, apiVersion);
-            Subscriptions = new Contacts.SubscriptionsClient(baseUri, bearerToken, apiVersion);
-            Tags = new Contacts.TagsClient(baseUri, bearerToken, apiVersion);
+            Companies = new Contacts.CompaniesClient(url, bearerToken, version);
+            Notes = new Contacts.NotesClient(url, bearerToken, version);
+            Segments = new Contacts.SegmentsClient(url, bearerToken, version);
+            Subscriptions = new Contacts.SubscriptionsClient(url, bearerToken, version);
+            Tags = new Contacts.TagsClient(url, bearerToken, version);
         }
 
-        public ContactsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public ContactsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
-            Companies = new Contacts.CompaniesClient(baseUri, bearerToken);
-            Notes = new Contacts.NotesClient(baseUri, bearerToken);
-            Segments = new Contacts.SegmentsClient(baseUri, bearerToken);
-            Subscriptions = new Contacts.SubscriptionsClient(baseUri, bearerToken);
-            Tags = new Contacts.TagsClient(baseUri, bearerToken);
+            Companies = new Contacts.CompaniesClient(url, bearerToken);
+            Notes = new Contacts.NotesClient(url, bearerToken);
+            Segments = new Contacts.SegmentsClient(url, bearerToken);
+            Subscriptions = new Contacts.SubscriptionsClient(url, bearerToken);
+            Tags = new Contacts.TagsClient(url, bearerToken);
         }
 
         public ListResponse List(ListRequest request)

diff --git a/Intercom/Clients/Conversations/ContactsClient.cs b/Intercom/Clients/Conversations/ContactsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Conversations.Contacts;
 using Intercom.Responses.Conversations.Contacts;
 using System.Threading.Tasks;
@@ -15,13 +16,13 @@ public interface IContactsClient
 
     internal class ContactsClient : BaseClient<ContactsClient>, IContactsClient
     {
-        public ContactsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public ContactsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public ContactsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public ContactsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }
 

diff --git a/Intercom/Clients/Conversations/TagsClient.cs b/Intercom/Clients/Conversations/TagsClient.cs
@@ -1,4 +1,5 @@
 using Intercom.Abstractions;
+using Intercom.Constants;
 using Intercom.Requests.Conversations.Tags;
 using Intercom.Responses.Conversations.Tags;
 using System.Threading.Tasks;
@@ -15,13 +16,13 @@ public interface ITagsClient
 
     internal class TagsClient : BaseClient<TagsClient>, ITagsClient
     {
-        public TagsClient(string baseUri, string bearerToken, System.Version apiVersion)
-            : base(baseUri, bearerToken, apiVersion)
+        public TagsClient(Url url, string bearerToken, Version version)
+            : base(url, bearerToken, version)
         {
         }
 
-        public TagsClient(string baseUri, string bearerToken)
-            : base(baseUri, bearerToken, Constants.Version.Latest)
+        public TagsClient(Url url, string bearerToken)
+            : base(url, bearerToken, Version.Latest)
         {
         }