Injecting AuthenticationTokenProvier into HttpRequestManager

Author: AlexDenton

PowerDms.Api.Rest.Client/PowerDms.Api.Rest.Client/AuthenticationTokenProvider.cs

@@ -9,11 +9,16 @@ public class AuthenticationTokenProvider : IAuthenticationTokenProvider
     {
         private readonly OAuthClient _OAuthClient;
 
+        private readonly string _OAuthClientSecret;
+
         private IDictionary<Credentials, string> _CachedCredentials;
 
-        public AuthenticationTokenProvider(OAuthClient oAuthClient)
+        public AuthenticationTokenProvider(
+            OAuthClient oAuthClient,
+            string oAuthClientSecret)
         {
             _OAuthClient = oAuthClient;
+            _OAuthClientSecret = oAuthClientSecret;
             _CachedCredentials = new Dictionary<Credentials, string>();
         }
 
@@ -28,7 +33,7 @@ public async Task<string> GetAccessToken(Credentials credentials)
                 credentials.Username,
                 credentials.Password,
                 credentials.SiteKey,
-                credentials.ClientSecret
+                _OAuthClientSecret
             )).GetContent<string>();
         }
     }

PowerDms.Api.Rest.Client/PowerDms.Api.Rest.Client/HttpRequestManager.cs

@@ -13,12 +13,12 @@ public class HttpRequestManager
         private readonly IAuthenticationTokenProvider _AuthenticationTokenProvider;
 
         public HttpRequestManager(
-            HttpClient httpClient)
+            HttpClient httpClient,
+            AuthenticationTokenProvider authenticationTokenProvider)
         {
             _HttpClient = httpClient;
             PowerDmsRestApiClient = new PowerDmsRestApiClient(httpClient);
-            _AuthenticationTokenProvider = new AuthenticationTokenProvider(
-                PowerDmsRestApiClient.OAuth);
+            _AuthenticationTokenProvider = authenticationTokenProvider;
         }
 
         public async Task<HttpResponseMessage> SendAsync<T>(HttpRequestBuilder<T> httpRequestBuilder)

PowerDms.Api.Rest.Client/PowerDms.Api.Rest.Client/PowerDms.Api.Rest.Client.csproj

@@ -9,7 +9,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\PowerDMS\tests\services\api\PowerDms.Api.Rest.Dtos\PowerDms.Api.Rest.Dtos.csproj" />
     <ProjectReference Include="..\PowerDms.Api.Rest.Dto\PowerDms.Api.Rest.Dto.csproj" />
   </ItemGroup>
 

PowerDms.Api.Rest.Client/PowerDms.Api.Rest.Client/RestApiRoutes.cs

@@ -2,7 +2,7 @@
 {
     public class RestApiRoutes
     {
-        public const string PowerDmsRestApiDomain = "api.powerdms.com";
+        public const string PowerDmsRestApiDomain = "https://api.powerdms.com";
 
         public const string Groups = "/principal/groups";