Commit b45ecf92: use ClientSecretCredentialOptions & friends

use ClientSecretCredentialOptions & friends

b45ecf92

Alexander Nosenko

committed Jun 12, 2023

Files

Details



	src/Refactorius.Authentication
	Core
	ConnectionStringExtensions.cs +
	StringExtensions.cs
	TaskExtensions.cs
	UrlStringExtensions.cs +
	AuthenticationTokenProvider.cs
	AzureAuthenticationMethod.cs
	AzureAuthenticationTokenProvider.cs +
	AzureCredentialConfig.cs
	AzureCredentialSettings.cs
	AzureTokenCredentialProvider.cs +
	CertificateProvider.cs
	CertificateSettings.cs
	ConnectionStringConstants.cs
	GlobalUsings.cs +
	IAzureAuthenticationTokenProvider.cs +
	IRequestAuthenticationFactory.cs
	IRequestAuthenticationProvider.cs
	Refactorius.Authentication.csproj
	RequestAuthenticationProviderExtensions.cs
	tests/Refactorius.Authentication.Tests
	Refactorius.Authentication.Tests.csproj
	Refactorius.Authentication.sln.DotSettings

ConnectionStringExtensions.cs

+54

/src/Refactorius.Authentication/Core/ConnectionStringExtensions.cs

View

using System.Data.Common;

namespace Refactorius.Authentication.Core;

public static class ConnectionStringExtensions

{

/// <summary>

/// Converts a ; separated string into a dictionary.

/// </summary>

/// <param name="connectionString">String to parse.</param>

/// <param name="lowercaseKeys">True to lower-case resulting keys lower-case, otherwise upper-case.</param>

/// <returns>Dictionary of properties from the connection string.</returns>

public static IDictionary<string, string?> ToConnectionStringDictionary(this string connectionString, bool lowercaseKeys)

{

var result = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);

if (string.IsNullOrWhiteSpace(connectionString))

return result;

try

{

DbConnectionStringBuilder source = new DbConnectionStringBuilder

{

ConnectionString = connectionString

};

source

.Cast<KeyValuePair<string, object>>()

.ForEach(kvp => result.Add(

lowercaseKeys

? kvp.Key.ToLowerInvariant()

: kvp.Key.ToUpperInvariant(),

kvp.Value?.ToString()?.Trim() ?? string.Empty));

return result;

}

catch

{

throw new FormatException("Invalid connection string format.");

}

/// <summary>

/// Extension to get the first item in a dictionary if the dictionary contains the key.

/// </summary>

/// <param name="dictionary">Dictionary to search.</param>

/// <param name="keys">Collection of keys to find.</param>

/// <returns>The value corresponding to the first of <paramref name="keys"/> found in <paramref name="dictionary"/>.</returns>

public static string? FirstNotNullOrEmpty(this IDictionary<string, string?> dictionary, params string[] keys)

{

return keys

.Where(key => dictionary.ContainsKey(key) && !string.IsNullOrEmpty(dictionary[key]))

.Select(key => dictionary[key])

.FirstOrDefault();

}

StringExtensions.cs

-128+18

/src/Refactorius.Authentication/Core/StringExtensions.cs

View

using System;

using System.Collections.Generic;

using System.Data.Common;

using System.Linq;

using System.Security;

namespace Refactorius.Authentication.Core;

/// <summary>

/// The locally useful extension methods.

/// </summary>

internal static class StringExtensions

public static class AzureCredentialConfigExtensions

{

public static SecureString ToSecureString(this string s)

{

var secure = new SecureString();

if (string.IsNullOrEmpty(s))

return null;

foreach (char c in s)

{

secure.AppendChar(c);

}

secure.MakeReadOnly();

return secure;

}

public static string EnsureTrailingSlash(this string s)

=> s?.TrimEnd('/') + "/";

public static Uri AsRootUri(this string url)

{

url.MustHaveText(nameof(url));

return new Uri(url.EnsureTrailingSlash(), UriKind.Absolute);

}

#if NOT_USED

/// <summary>

/// Split a string into individual elements by the specified delimiter, where

/// a delimiter enclosed within double-quotes '"' is considered to be part of the same

/// <param name="input">Delimited string</param>

/// <param name="delimiter">Element delimiter</param>

/// <param name="quote">The quote character.</param>

/// <returns>List of elements</returns>

public static string[] SplitWithQuotes(this string input, char delimiter, char quote = '"')

/// <returns>List of elements. It is empty if <paramref name="input"/> is <see langword="null"/> or empty.</returns>

public static string[] SplitWithQuotes(this string? input, char delimiter, char quote = '"')

{

if (string.IsNullOrWhiteSpace(input))

{

/// <summary>

/// Parse a delimited string of key-value pairs in to a dictionary.

/// </summary>

/// <param name="input">Delimited string of key-value pairs</param>

/// <param name="delimiter">Character used as a delimiter between key-value pairs</param>

/// <param name="input">Delimited string of key-value pairs.</param>

/// <param name="delimiter">Character used as a delimiter between key-value pairs.</param>

/// <param name="urlDecode">True to perform URL decoding of both the keys and values</param>

/// <param name="lowercaseKeys">True to make all resulting keys lower-case</param>

/// <param name="strict">Throw <see cref="ArgumentException"/> when the input string contains a malformed key-value pair</param>

/// <exception cref="ArgumentException">Thrown if <paramref name="strict"/> is true and a malformed key-value pair is present in <paramref name="input"/></exception>

/// <returns>Dictionary of string key-value pairs</returns>

/// <param name="lowercaseKeys">True to lower-case resulting keys lower-case, otherwise upper-case.</param>

/// <param name="strict">Throw <see cref="FormatException"/> when the input string contains a malformed key-value pair.</param>

/// <exception cref="FormatException">Thrown if <paramref name="strict"/> is true and a malformed key-value pair is present in <paramref name="input"/>.</exception>

/// <returns>Dictionary of string key-value pairs.</returns>

public static Dictionary<string, string> ParseKeyValueList(this string input, char delimiter, bool urlDecode, bool lowercaseKeys,

bool strict)

{

value = UrlDecode(value);

}

if (lowercaseKeys)

{

key = key.Trim().ToLowerInvariant();

}

key = lowercaseKeys

? key.Trim().ToLowerInvariant()

: key.Trim().ToUpperInvariant();

value = value.Trim().Trim(new[] {'\"'}).Trim();

}

else if (strict && pair.Length > 2)

{

throw new ArgumentException(nameof(input));

throw new FormatException(nameof(input));

}

return response;

}

/// <summary>

/// Decode the given URL encoded string.

/// </summary>

/// <param name="message">URL encoded string to decode</param>

/// <returns>Decoded string</returns>

/// <remarks>This method decodes "+" (as well as "%20") into the space character ' '.</remarks>

public static string UrlDecode(this string message)

{

if (string.IsNullOrEmpty(message))

return message;

message = message.Replace("+", "%20");

message = Uri.UnescapeDataString(message);

return message;

}

/// <summary>

/// Converts a ; separated string into a dictionary

/// </summary>

/// <param name="connectionString">String to parse</param>

/// <returns>Dictionary of properties from the connection string</returns>

public static IDictionary<string, string> ToConnectionStringDictionary(this string connectionString)

{

if (string.IsNullOrWhiteSpace(connectionString))

return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

try

{

DbConnectionStringBuilder source = new DbConnectionStringBuilder

{

ConnectionString = connectionString

};

return source

.Cast<KeyValuePair<string, object>>()

.ToDictionary(

kvp => kvp.Key,

kvp =>

kvp.Value?.ToString()?.Trim() ?? string.Empty);

}

catch

{

throw new FormatException("Invalid connection string format");

}

/// <summary>

/// Extension to get the first item in a dictionary if the dictionary contains the key.

/// </summary>

/// <param name="dictionary">Dictionary to search</param>

/// <param name="keys">Collection of Keys to find.</param>

/// <returns></returns>

public static string FirstNotNullOrEmpty(this IDictionary<string, string> dictionary, params string[] keys)

{

return (

from key in keys

where dictionary.ContainsKey(key) && !string.IsNullOrEmpty(dictionary[key])

select dictionary[key]).FirstOrDefault<string>();

}

public static AzureCredentialConfig ToAzureCredentialConfig(this string connectionString)

{

connectionString.MustHaveText(nameof(connectionString));

return connectionString.ToConnectionStringDictionary().ToAzureCredentialConfig();

return connectionString.ToConnectionStringDictionary(false).ToAzureCredentialConfig();

}

public static AzureCredentialConfig ToAzureCredentialConfig(this IDictionary<string, string> connection)

{

return new AzureCredentialConfig()

public static AzureCredentialConfig ToAzureCredentialConfig(this IDictionary<string, string> props)

{

Resource = connection.FirstNotNullOrEmpty(ConnectionStringConstants.ServiceUri),

UserName = connection.FirstNotNullOrEmpty(ConnectionStringConstants.UserName),

Password = connection.FirstNotNullOrEmpty(ConnectionStringConstants.Password),

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.Domain);

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.HomeRealmUri);

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.RequireNewInstance);

ApplicationId = connection.FirstNotNullOrEmpty(ConnectionStringConstants.ClientId),

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.RedirectUri);

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.TokenCacheStorePath);

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.LoginPrompt);

CertificatePath = connection.FirstNotNullOrEmpty(ConnectionStringConstants.CertStoreName),

CertificateThumbprint = connection.FirstNotNullOrEmpty(ConnectionStringConstants.CertThumbprint),

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.SkipDiscovery);

//connection.FirstNotNullOrEmpty(ConnectionStringConstants.IntegratedSecurity);

ClientSecret = connection.FirstNotNullOrEmpty(ConnectionStringConstants.ClientSecret),

TenantId = connection.FirstNotNullOrEmpty("TenantId"),

CertificatePassword = connection.FirstNotNullOrEmpty("CertificatePassword"),

// TODO: UserAgent, Scope

};

return new AzureCredentialConfig().SetFromProps(props);

}

#endif

}

TaskExtensions.cs

-1

/src/Refactorius.Authentication/Core/TaskExtensions.cs

View

using System;

using System.Linq;

using System.Threading.Tasks;

UrlStringExtensions.cs

/src/Refactorius.Authentication/Core/UrlStringExtensions.cs

View

AuthenticationTokenProvider.cs

/src/Refactorius.Authentication/AuthenticationTokenProvider.cs

View

AzureAuthenticationMethod.cs

/src/Refactorius.Authentication/AzureAuthenticationMethod.cs

View

AzureAuthenticationTokenProvider.cs

/src/Refactorius.Authentication/AzureAuthenticationTokenProvider.cs

View

AzureCredentialConfig.cs

/src/Refactorius.Authentication/AzureCredentialConfig.cs

View

AzureCredentialSettings.cs

/src/Refactorius.Authentication/AzureCredentialSettings.cs

View

AzureTokenCredentialProvider.cs

/src/Refactorius.Authentication/AzureTokenCredentialProvider.cs

View

CertificateProvider.cs

/src/Refactorius.Authentication/CertificateProvider.cs

View

CertificateSettings.cs

/src/Refactorius.Authentication/CertificateSettings.cs

View

ConnectionStringConstants.cs

/src/Refactorius.Authentication/ConnectionStringConstants.cs

View

GlobalUsings.cs

/src/Refactorius.Authentication/GlobalUsings.cs

View

IAzureAuthenticationTokenProvider.cs

/src/Refactorius.Authentication/IAzureAuthenticationTokenProvider.cs

View

IRequestAuthenticationFactory.cs

/src/Refactorius.Authentication/IRequestAuthenticationFactory.cs

View

IRequestAuthenticationProvider.cs

/src/Refactorius.Authentication/IRequestAuthenticationProvider.cs

View

Refactorius.Authentication.csproj

/src/Refactorius.Authentication/Refactorius.Authentication.csproj

View

RequestAuthenticationProviderExtensions.cs

/src/Refactorius.Authentication/RequestAuthenticationProviderExtensions.cs

View

Refactorius.Authentication.Tests.csproj

/tests/Refactorius.Authentication.Tests/Refactorius.Authentication.Tests.csproj

View

Refactorius.Authentication.sln.DotSettings

/Refactorius.Authentication.sln.DotSettings

View