pre-pull-request changes

Author: Matej Grochal

src/TeaPie/Http/Auth/OAuth2/OAuth2OptionsBuilder.cs

@@ -18,9 +18,9 @@ private OAuth2OptionsBuilder() { }
     public static OAuth2OptionsBuilder Create() => new();
 
     /// <summary>
-    /// Adds URL to which user should be authenticated.
+    /// Adds URL on which user should be authenticated.
     /// </summary>
-    /// <param name="oauthUrl">URL to which user should be authenticated.</param>
+    /// <param name="oauthUrl">URL on which user should be authenticated.</param>
     /// <returns>Updated instance of builder.</returns>
     public OAuth2OptionsBuilder WithAuthUrl(string oauthUrl)
     {
@@ -74,7 +74,6 @@ public OAuth2OptionsBuilder WithUsername(string username)
 
     /// <summary>
     /// Adds 'password' parameter with <paramref name="password"/> value.
-    /// With refresh of the token, variable will be updated.
     /// </summary>
     /// <param name="password">Value of the parameter with name 'password'.</param>
     /// <returns>Updated instance of builder.</returns>
@@ -86,7 +85,7 @@ public OAuth2OptionsBuilder WithPassword(string password)
 
     /// <summary>
     /// Access token will be saved to variable named by <paramref name="variableName"/>.
-    /// With refresh of the token, variable will be updated.
+    /// With token change, variable is updated accordingly.
     /// </summary>
     /// <param name="variableName">Name of the variable which will hold access token value.</param>
     /// <returns>Updated instance of builder.</returns>
@@ -111,6 +110,10 @@ public OAuth2OptionsBuilder AddParameter(string key, string value)
         return this;
     }
 
+    /// <summary>
+    /// Creates <see cref="OAuth2Options"/> according to configuration of the builder.
+    /// </summary>
+    /// <returns>Options for OAuth2 provider.</returns>
     public OAuth2Options Build()
     {
         CheckRequiredParameters();

src/TeaPie/Http/Auth/OAuth2/OAuth2Provider.cs

@@ -42,17 +42,22 @@ private async Task<string> GetToken()
         {
             var newToken = await GetTokenFromRequest();
             source = ResolveRequestUri();
-            if (_configuration.AccessTokenVariableName is not null)
-            {
-                _variables.SetVariable(_configuration.AccessTokenVariableName, newToken);
-            }
+            SetVariableIfNeeded(newToken);
             return newToken;
         })!;
 
         _logger.LogTrace("{Subject} was fetched from {Source}.", "Access token", source);
         return token!;
     }
 
+    private void SetVariableIfNeeded(string newToken)
+    {
+        if (_configuration.AccessTokenVariableName is not null)
+        {
+            _variables.SetVariable(_configuration.AccessTokenVariableName, newToken);
+        }
+    }
+
     private async Task<string> GetTokenFromRequest()
     {
         ResolveParameters(out var requestContent, out var requestUri);
@@ -76,11 +81,11 @@ private void LogSendingRequest()
             body);
     }
 
-    private static string ToStringMaskingSecrets(KeyValuePair<string, string> p)
-        => p.Key.Contains("password", StringComparison.OrdinalIgnoreCase) ||
-            p.Key.Contains("secret", StringComparison.OrdinalIgnoreCase)
-                ? $"{p.Key}={new string('*', p.Value.Length)}"
-                : $"{p.Key}={p.Value}";
+    private static string ToStringMaskingSecrets(KeyValuePair<string, string> parameter)
+        => parameter.Key.Contains("password", StringComparison.OrdinalIgnoreCase) ||
+            parameter.Key.Contains("secret", StringComparison.OrdinalIgnoreCase)
+                ? $"{parameter.Key}={new string('*', parameter.Value.Length)}"
+                : $"{parameter.Key}={parameter.Value}";
 
     private void ResolveParameters(out FormUrlEncodedContent requestContent, out string requestUri)
     {

src/TeaPie/TeaPie.csproj

@@ -14,7 +14,6 @@
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="NuGet.Protocol" />
-    <PackageReference Include="Polly" />
     <PackageReference Include="Polly.Core" />
     <PackageReference Include="Serilog" />
     <PackageReference Include="Serilog.Extensions.Logging" />