Polishing before v1.0.0 (#35)

keghub · Nov 10, 2020 · 8ede25c · 8ede25c
1 parent 90530f5
commit 8ede25c
Show file tree

Hide file tree

Showing 14 changed files with 167 additions and 168 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,46 +5,46 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Raw OAuth",
+            "name": "HubSpot.Client - OAuth",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/samples/RawOAuth/bin/Debug/netcoreapp3.1/RawOAuth.dll",
+            "program": "${workspaceFolder}/samples/hubspot-client/OAuthAuthentication/bin/Debug/netcoreapp3.1/OAuthAuthentication.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/RawOAuth",
+            "cwd": "${workspaceFolder}/samples/hubspot-client/OAuthAuthentication",
             "console": "internalConsole",
             "stopAtEntry": false
         },
         {
-            "name": "Raw ApiKey",
+            "name": "HubSpot.Client - ApiKey",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/samples/RawApiKey/bin/Debug/netcoreapp3.1/RawApiKey.dll",
+            "program": "${workspaceFolder}/samples/hubspot-client/ApiKeyAuthentication/bin/Debug/netcoreapp3.1/ApiKeyAuthentication.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/RawApiKey",
+            "cwd": "${workspaceFolder}/samples/hubspot-client/ApiKeyAuthentication",
             "console": "internalConsole",
             "stopAtEntry": false
         },
         {
-            "name": "OAuth",
+            "name": "HubSpot - OAuth",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/samples/OAuth/bin/Debug/netcoreapp3.1/OAuth.dll",
+            "program": "${workspaceFolder}/samples/hubspot/OAuthAuthentication/bin/Debug/netcoreapp3.1/OAuthAuthentication.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/OAuth",
+            "cwd": "${workspaceFolder}/samples/hubspot/OAuthAuthentication",
             "console": "internalConsole",
             "stopAtEntry": false
         },
         {
-            "name": "ApiKey",
+            "name": "HubSpot - ApiKey",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/samples/ApiKey/bin/Debug/netcoreapp3.1/ApiKey.dll",
+            "program": "${workspaceFolder}/samples/hubspot/ApiKeyAuthentication/bin/Debug/netcoreapp3.1/ApiKeyAuthentication.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/ApiKey",
+            "cwd": "${workspaceFolder}/samples/hubspot/ApiKeyAuthentication",
             "console": "internalConsole",
             "stopAtEntry": false
         },

diff --git a/HubSpotSdk.sln b/HubSpotSdk.sln
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,10 +8,6 @@ image: Visual Studio 2019
 cache:
   - '%LocalAppData%\NuGet\v3-cache'
 
-skip_commits:
-  files:
-    - docs/*
-
 nuget:
   account_feed: false
   project_feed: false

diff --git a/docs/hubspot/basic-configuration.md b/docs/hubspot/basic-configuration.md
@@ -19,14 +19,14 @@ Additional extension methods to the `IHubSpotConfigurator` type are available an
 
 While being a higher-layer library, this library allows full access to the customization of the HubSpot client as described [earlier](../hubspot-client/configuration.md).
 
-This can be achieved using the `AddClientConfiguration` method.
+This can be achieved using the `ConfigureHubSpotClient` method.
 
 In the snippet below, we're registering all the customizations we added earlier.
 
 ```csharp
 services.AddHubSpot(hs => 
 {
-    hs.AddClientConfiguration(client => client
+    hs.ConfigureHubSpotClient(client => client
         .SetBaseAddress(new Uri("https://localhost.temp"))
         .UseOAuthAuthentication(configuration.GetSection("HubSpot"))
         .ConfigureSerialization(settings => settings.Formatting = Newtonsoft.Json.Formatting.Indented)
@@ -39,7 +39,7 @@ services.AddHubSpot(hs =>
 
 ## Authentication
 
-Since HubSpot always require any of the two supported authentication methods, convenience methods are offered to set up the authentication method without the need of using `AddClientConfiguration`.
+Since HubSpot always require any of the two supported authentication methods, convenience methods are offered to set up the authentication method without the need of using `ConfigureHubSpotClient`.
 
 ```csharp
 services.AddHubSpot(hs => 
@@ -53,4 +53,4 @@ services.AddHubSpot(hs =>
 });
 ```
 
-The same assumptions done [earlier](../hubspot-client/configuration.md#Authentication) apply.
+The same assumptions done [earlier](../hubspot-client/configuration.md#authentication) apply.
diff --git a/samples/RawApiKey/RawApiKey.csproj → ...uthentication/ApiKeyAuthentication.csproj b/samples/RawApiKey/RawApiKey.csproj → ...uthentication/ApiKeyAuthentication.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\HubSpot.Client\HubSpot.Client.csproj" />
+    <ProjectReference Include="..\..\..\src\HubSpot.Client\HubSpot.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/RawApiKey/Program.cs → ...ot-client/ApiKeyAuthentication/Program.cs b/samples/RawApiKey/Program.cs → ...ot-client/ApiKeyAuthentication/Program.cs
diff --git a/samples/RawOAuth/RawOAuth.csproj → ...Authentication/OAuthAuthentication.csproj b/samples/RawOAuth/RawOAuth.csproj → ...Authentication/OAuthAuthentication.csproj
@@ -14,6 +14,6 @@
     <PackageReference Include="Kralizek.Extensions.Configuration.Objects" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\HubSpot.Client\HubSpot.Client.csproj" />
+    <ProjectReference Include="..\..\..\src\HubSpot.Client\HubSpot.Client.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/RawOAuth/Program.cs → ...pot-client/OAuthAuthentication/Program.cs b/samples/RawOAuth/Program.cs → ...pot-client/OAuthAuthentication/Program.cs
diff --git a/samples/ApiKey/ApiKey.csproj → ...uthentication/ApiKeyAuthentication.csproj b/samples/ApiKey/ApiKey.csproj → ...uthentication/ApiKeyAuthentication.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\HubSpot\HubSpot.csproj" />
+    <ProjectReference Include="..\..\..\src\HubSpot\HubSpot.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ApiKey/Program.cs → ...s/hubspot/ApiKeyAuthentication/Program.cs b/samples/ApiKey/Program.cs → ...s/hubspot/ApiKeyAuthentication/Program.cs
diff --git a/samples/OAuth/OAuth.csproj → ...Authentication/OAuthAuthentication.csproj b/samples/OAuth/OAuth.csproj → ...Authentication/OAuthAuthentication.csproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\HubSpot\HubSpot.csproj" />
+    <ProjectReference Include="..\..\..\src\HubSpot\HubSpot.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/OAuth/Program.cs → ...es/hubspot/OAuthAuthentication/Program.cs b/samples/OAuth/Program.cs → ...es/hubspot/OAuthAuthentication/Program.cs
diff --git a/src/HubSpot.Client/Authentication/OAuthHubSpotAuthenticator.cs b/src/HubSpot.Client/Authentication/OAuthHubSpotAuthenticator.cs
@@ -112,7 +112,7 @@ public class OAuthOptions
     {
         public string ClientId { get; set; }
 
-        public Uri RedirectUri { get; set; }
+        public Uri RedirectUri { get; set; } = new Uri("https://www.hubspot.com");
 
         public string RefreshToken { get; set; }
 

diff --git a/src/HubSpot/Configuration/HubSpotConfiguratorExtensions.cs b/src/HubSpot/Configuration/HubSpotConfiguratorExtensions.cs
@@ -12,6 +12,13 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class HubSpotConfiguratorExtensions
     {
+        public static IHubSpotConfigurator ConfigureHubSpotClient(this IHubSpotConfigurator configurator, Action<IHubSpotClientConfigurator> clientConfiguration)
+        {
+            configurator.AddClientConfiguration(clientConfiguration);
+
+            return configurator;
+        }
+
         public static IHubSpotConfigurator UseContactConnector(this IHubSpotConfigurator configurator)
         {
             configurator.AddServiceConfiguration(services =>