Generate sync AccessTokenProvider

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
 	<ItemGroup>
     	<PackageVersion  Include="BenchmarkDotNet" Version="0.13.1" />
-		<PackageVersion  Include="D2L.CodeStyle.Analyzers" Version="0.196.0" />
+		<PackageVersion  Include="D2L.CodeStyle.Analyzers" Version="0.203.0" />
 		<PackageVersion  Include="D2L.CodeStyle.Annotations" Version="0.31.0" />
 		<PackageVersion  Include="D2L.Services.Core.Exceptions" Version="2.0.1.15" />
 		<PackageVersion  Include="FluentAssertions" Version="6.6.0" />

src/D2L.Security.OAuth2/Caching/ICache.cs

@@ -1,18 +1,20 @@
 using System;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Caching {
 
 	/// <summary>
 	/// A generic (string-value-based) caching interface
 	/// </summary>
-	public interface ICache {
+	public partial interface ICache {
 
 		/// <summary>
 		/// Attempts to retrieve the value for <paramref name="key"/> from the cache
 		/// </summary>
 		/// <param name="key">The key of the value to retrieve</param>
 		/// <returns>For a cache hit, the value in the cache matching <paramref name="key"/>; for a cache miss, a <see cref="CacheResponse"/> with <see cref="CacheResponse.Success"/> set to false</returns>
+		[GenerateSync]
 		Task<CacheResponse> GetAsync(
 			string key
 		);
@@ -23,6 +25,7 @@ string key
 		/// <param name="key">The key of the <paramref name="value"/> to cache</param>
 		/// <param name="value">The value to cache</param>
 		/// <param name="expiry">The maximum time the value can live in the cache for</param>
+		[GenerateSync]
 		Task SetAsync(
 			string key,
 			string value,
@@ -33,6 +36,7 @@ TimeSpan expiry
 		/// Remove the item matching <paramref name="key"/> from the cache
 		/// </summary>
 		/// <param name="key">The key of the item to remove</param>
+		[GenerateSync]
 		Task RemoveAsync(
 			string key
 		);

src/D2L.Security.OAuth2/Caching/NullCache.cs

@@ -1,15 +1,25 @@
 using System;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Caching {
-	internal sealed class NullCache : ICache {
+	internal sealed partial class NullCache : ICache {
 
 		private static readonly CacheResponse NULL_RESPONSE = new CacheResponse( success: false, value: null );
 
-		Task<CacheResponse> ICache.GetAsync( string key ) => Task.FromResult( NULL_RESPONSE );
+		[GenerateSync]
+		Task<CacheResponse> ICache.GetAsync( string key ) {
+			return Task.FromResult( NULL_RESPONSE );
+		}
 
-		Task ICache.SetAsync( string key, string value, TimeSpan expiry ) => Task.CompletedTask;
+		[GenerateSync]
+		Task ICache.SetAsync( string key, string value, TimeSpan expiry ) {
+			return Task.CompletedTask;
+		}
 
-		Task ICache.RemoveAsync( string key ) => Task.CompletedTask;
+		[GenerateSync]
+		Task ICache.RemoveAsync( string key ) {
+			return Task.CompletedTask;
+		}
 	}
 }

src/D2L.Security.OAuth2/Keys/Default/EcDsaPrivateKeyProvider.cs

@@ -2,6 +2,7 @@
 using Microsoft.IdentityModel.Tokens;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys.Default {
 	internal sealed partial class EcDsaPrivateKeyProvider : IPrivateKeyProvider {
@@ -17,6 +18,7 @@ ECCurve curve
 			m_curve = curve;
 		}
 
+		[GenerateSync]
 		Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 			var ecdsa = ECDsa.Create( m_curve );
 			var parameters = ecdsa.ExportParameters( includePrivateParameters: true );

src/D2L.Security.OAuth2/Keys/Default/IPrivateKeyProvider.cs

@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys.Default {
-	internal interface IPrivateKeyProvider {
+	internal partial interface IPrivateKeyProvider {
+		[GenerateSync]
 		Task<D2LSecurityToken> GetSigningCredentialsAsync();
 	}
 }

src/D2L.Security.OAuth2/Keys/Default/RotatingPrivateKeyProvider.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 using D2L.Security.OAuth2.Utilities;
 using D2L.Services;
 
 namespace D2L.Security.OAuth2.Keys.Default {
-	internal sealed class RotatingPrivateKeyProvider : IPrivateKeyProvider {
+	internal sealed partial class RotatingPrivateKeyProvider : IPrivateKeyProvider {
 
 		private readonly IPrivateKeyProvider m_inner;
 		private readonly IDateTimeProvider m_dateTimeProvider;
@@ -25,6 +26,7 @@ TimeSpan keyRotationPeriod
 			m_keyRotationPeriod = keyRotationPeriod;
 		}
 
+		[GenerateSync]
 		async Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 
 			// Hold a local reference so that we know we are talking about the same key
@@ -61,4 +63,4 @@ TimeSpan keyRotationPeriod
 			return key == null || m_dateTimeProvider.UtcNow >= key.ValidTo - m_keyRotationPeriod;
 		}
 	}
-}
+}

src/D2L.Security.OAuth2/Keys/Default/RsaPrivateKeyProvider.cs

@@ -2,6 +2,7 @@
 using Microsoft.IdentityModel.Tokens;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys.Default {
 	internal sealed partial class RsaPrivateKeyProvider : IPrivateKeyProvider {
@@ -14,6 +15,7 @@ ID2LSecurityTokenFactory d2lSecurityTokenFactory
 			m_d2lSecurityTokenFactory = d2lSecurityTokenFactory;
 		}
 
+		[GenerateSync]
 		Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 			RSAParameters privateKey;
 			using( var csp = new RSACryptoServiceProvider( Constants.GENERATED_RSA_KEY_SIZE ) { PersistKeyInCsp = false } ) {

src/D2L.Security.OAuth2/Keys/Default/SavingPrivateKeyProvider.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 using D2L.Services;
 
 namespace D2L.Security.OAuth2.Keys.Default {
-	internal sealed class SavingPrivateKeyProvider : IPrivateKeyProvider {
+	internal sealed partial class SavingPrivateKeyProvider : IPrivateKeyProvider {
 		private readonly IPrivateKeyProvider m_inner;
 		private readonly IPublicKeyDataProvider m_publicKeyDataProvider;
 
@@ -15,6 +16,7 @@ ISanePublicKeyDataProvider publicKeyDataProvider
 			m_publicKeyDataProvider = publicKeyDataProvider;
 		}
 
+		[GenerateSync]
 		async Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 			D2LSecurityToken result = await m_inner.GetSigningCredentialsAsync().ConfigureAwait( false );
 

src/D2L.Security.OAuth2/Keys/Default/TokenSigner.cs

@@ -2,10 +2,11 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 using D2L.Security.OAuth2.Validation.Exceptions;
 
 namespace D2L.Security.OAuth2.Keys.Default {
-	public sealed class TokenSigner : ITokenSigner {
+	public sealed partial class TokenSigner : ITokenSigner {
 
 		private readonly IPrivateKeyProvider m_privateKeyProvider;
 
@@ -19,6 +20,7 @@ IPrivateKeyProvider privateKeyProvider
 			m_privateKeyProvider = privateKeyProvider;
 		}
 
+		[GenerateSync]
 		async Task<string> ITokenSigner.SignAsync( UnsignedToken token ) {
 			JwtSecurityToken jwt;
 			using( D2LSecurityToken securityToken = await m_privateKeyProvider

src/D2L.Security.OAuth2/Keys/Development/StaticPrivateKeyProvider.cs

@@ -3,14 +3,15 @@
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 using D2L.Security.OAuth2.Keys.Default;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys.Development {
 
 	/// <summary>
 	/// A private key provider with a fixed key for testing purposes
 	/// </summary>
 	[Obsolete( "Only use this in tests and for prototyping." )]
-	internal sealed class StaticPrivateKeyProvider : IPrivateKeyProvider {
+	internal sealed partial class StaticPrivateKeyProvider : IPrivateKeyProvider {
 		private readonly string m_keyId;
 		private readonly RSAParameters m_rsaParameters;
 
@@ -22,6 +23,7 @@ RSAParameters rsaParameters
 			m_rsaParameters = rsaParameters;
 		}
 
+		[GenerateSync]
 		public Task<D2LSecurityToken> GetSigningCredentialsAsync() {
 			var creds = new D2LSecurityToken(
 				id: m_keyId,

src/D2L.Security.OAuth2/Keys/IKeyManagementService.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys {
-	public interface IKeyManagementService {
+	public partial interface IKeyManagementService {
 		/// <summary>
 		/// Generates a new key (storing it's public and private keys) if the
 		/// existing ones are getting near their expiry.
@@ -19,6 +20,7 @@ public interface IKeyManagementService {
 		/// <returns>
 		/// The amount of time to wait before calling this again.
 		/// </returns>
+		[GenerateSync]
 		Task<TimeSpan> RefreshKeyAsync();
 	}
 }

src/D2L.Security.OAuth2/Keys/IPrivateKeyDataProvider.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys {
 	/// <summary>
 	/// An externally-implemented storage for private keys.
 	/// </summary>
-	public interface IPrivateKeyDataProvider {
+	public partial interface IPrivateKeyDataProvider {
 		/// <summary>
 		/// Save a private key.
 		/// </summary>
@@ -17,6 +18,7 @@ public interface IPrivateKeyDataProvider {
 		/// </summary>
 		/// <param name="validUntilAtLeast">The earliest possible expiry time toreturn (should be in the future.)</param>
 		/// <returns>All non-expired/expiring private keys</returns>
+		[GenerateSync]
 		Task<IEnumerable<PrivateKeyData>> GetAllAsync(
 			DateTimeOffset validUntilAtLeast
 		);

src/D2L.Security.OAuth2/Keys/ITokenSigner.cs

@@ -1,16 +1,18 @@
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 
 namespace D2L.Security.OAuth2.Keys {
 	/// <summary>
 	/// An abstraction for signing tokens
 	/// </summary>
-	public interface ITokenSigner {
+	public partial interface ITokenSigner {
 
 		/// <summary>
 		/// Signs a token
 		/// </summary>
 		/// <param name="token">The token to be signed</param>
 		/// <returns>The raw signed token as a <see cref="string"/></returns>
+		[GenerateSync]
 		Task<string> SignAsync( UnsignedToken token );
 	}
 }

src/D2L.Security.OAuth2/Keys/KeyManagementService.cs

@@ -1,4 +1,5 @@
-using D2L.Security.OAuth2.Keys.Default;
+using D2L.CodeStyle.Annotations;
+using D2L.Security.OAuth2.Keys.Default;
 using D2L.Security.OAuth2.Utilities;
 using Microsoft.IdentityModel.Tokens;
 using System;
@@ -8,7 +9,7 @@
 using System.Threading.Tasks;
 
 namespace D2L.Security.OAuth2.Keys {
-	public sealed class KeyManagementService : IKeyManagementService, IPrivateKeyProvider, IDisposable {
+	public sealed partial class KeyManagementService : IKeyManagementService, IPrivateKeyProvider, IDisposable {
 		private readonly IPublicKeyDataProvider m_publicKeys;
 		private readonly IPrivateKeyDataProvider m_privateKeys;
 		private readonly IDateTimeProvider m_clock;
@@ -44,6 +45,7 @@ OAuth2Configuration config
 			config.CheckSanity();
 		}
 
+		[GenerateSync]
 		async Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 			var current = Volatile.Read( ref m_current );
 
@@ -65,6 +67,7 @@ await RefreshKeyAsync( now )
 			return current.Ref();
 		}
 
+		[GenerateSync]
 		async Task<TimeSpan> IKeyManagementService.RefreshKeyAsync() {
 			var now = m_clock.UtcNow;
 
@@ -149,6 +152,7 @@ await RefreshKeyAsync( now )
 			).ConfigureAwait( false );
 		}
 
+		[GenerateSync]
 		private async Task RefreshKeyAsync( DateTimeOffset now ) {
 			var keys = await m_privateKeys.GetAllAsync(
 				validUntilAtLeast: now

src/D2L.Security.OAuth2/Provisioning/Default/AccessTokenProvider.cs

@@ -3,13 +3,14 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 using D2L.Security.OAuth2.Keys;
 using D2L.Security.OAuth2.Scopes;
 using D2L.Services;
 
 namespace D2L.Security.OAuth2.Provisioning.Default {
 
-	internal sealed class AccessTokenProvider : INonCachingAccessTokenProvider {
+	internal sealed partial class AccessTokenProvider : INonCachingAccessTokenProvider {
 
 		private readonly IAuthServiceClient m_client;
 		private readonly ITokenSigner m_tokenSigner;
@@ -22,6 +23,7 @@ IAuthServiceClient authServiceClient
 			m_client = authServiceClient;
 		}
 
+		[GenerateSync]
 		Task<IAccessToken> INonCachingAccessTokenProvider.ProvisionAccessTokenAsync(
 			ClaimSet claimSet,
 			IEnumerable<Scope> scopes
@@ -30,6 +32,7 @@ IEnumerable<Scope> scopes
 			return @this.ProvisionAccessTokenAsync( claimSet.ToClaims(), scopes );
 		}
 
+		[GenerateSync]
 		async Task<IAccessToken> INonCachingAccessTokenProvider.ProvisionAccessTokenAsync(
 			IEnumerable<Claim> claimSet,
 			IEnumerable<Scope> scopes

src/D2L.Security.OAuth2/Provisioning/Default/AuthServiceClient.cs

@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using D2L.CodeStyle.Annotations;
 using D2L.Security.OAuth2.Scopes;
 using D2L.Security.OAuth2.Utilities;
 using D2L.Services.Core.Exceptions;
@@ -25,7 +26,7 @@ namespace D2L.Security.OAuth2.Provisioning.Default {
 		"D2L0096:Aliasing attribute class names not supported",
 		Justification = "Newtonsoft.Json.JsonPropertyAttribute is aliased to match System.Text.Json.Serialization.JsonPropertyNameAttribute to reduce duplication below."
 	)]
-	internal sealed class AuthServiceClient : IAuthServiceClient {
+	internal sealed partial class AuthServiceClient : IAuthServiceClient {
 
 		private const string TOKEN_PATH = "connect/token";
 
@@ -74,6 +75,7 @@ Uri authEndpoint
 		/// The auth service could not be reached, or it did not respond with
 		/// a status code indicating success.
 		/// </exception>
+		[GenerateSync]
 		async Task<IAccessToken> IAuthServiceClient.ProvisionAccessTokenAsync(
 			string assertion,
 			IEnumerable<Scope> scopes
@@ -82,7 +84,7 @@ IEnumerable<Scope> scopes
 			HttpResponseMessage response = null;
 			try {
 				try {
-					response = await MakeRequest( requestBody ).ConfigureAwait( false );
+					response = await MakeRequestAsync( requestBody ).ConfigureAwait( false );
 				} catch( TaskCanceledException exception ) {
 					throw new AuthServiceException(
 						errorType: ServiceErrorType.Timeout,
@@ -158,7 +160,8 @@ IEnumerable<Scope> scopes
 			}
 		}
 
-		private Task<HttpResponseMessage> MakeRequest( string body ) {
+		[GenerateSync]
+		private Task<HttpResponseMessage> MakeRequestAsync( string body ) {
 			var request = new HttpRequestMessage( HttpMethod.Post, m_tokenProvisioningEndpoint );
 			request.Content = new StringContent( body, Encoding.UTF8, "application/x-www-form-urlencoded" );