Provide a more DI-friendly interface to the objects in this library (#…

…194)

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

@@ -5,11 +5,15 @@
 using D2L.Security.OAuth2.Validation.Exceptions;
 
 namespace D2L.Security.OAuth2.Keys.Default {
-	internal sealed class TokenSigner : ITokenSigner {
+	public sealed class TokenSigner : ITokenSigner {
 
 		private readonly IPrivateKeyProvider m_privateKeyProvider;
 
 		public TokenSigner(
+			IKeyManagementService keyManagementService
+		) : this( (IPrivateKeyProvider)keyManagementService ) {}
+
+		internal TokenSigner(
 			IPrivateKeyProvider privateKeyProvider
 		) {
 			m_privateKeyProvider = privateKeyProvider;

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

@@ -8,15 +8,15 @@
 using System.Threading.Tasks;
 
 namespace D2L.Security.OAuth2.Keys {
-	internal sealed class KeyManagementService : IKeyManagementService, IPrivateKeyProvider, IDisposable {
+	public sealed class KeyManagementService : IKeyManagementService, IPrivateKeyProvider, IDisposable {
 		private readonly IPublicKeyDataProvider m_publicKeys;
 		private readonly IPrivateKeyDataProvider m_privateKeys;
 		private readonly IDateTimeProvider m_clock;
 		private readonly OAuth2Configuration m_config;
 
 		private D2LSecurityToken m_current = null;
 
-		public KeyManagementService(
+		internal KeyManagementService(
 			IPublicKeyDataProvider publicKeys,
 			IPrivateKeyDataProvider privateKeys,
 			IDateTimeProvider clock,
@@ -28,6 +28,22 @@ OAuth2Configuration config
 			m_config = config;
 		}
 
+		// Constructor for use outside of this library.
+		// We are hiding our mockable clock interface for now, but we could
+		// re-evaluate that in the future.
+		public KeyManagementService(
+			IPublicKeyDataProvider publicKeys,
+			IPrivateKeyDataProvider privateKeys,
+			OAuth2Configuration config = null
+		) : this(
+			publicKeys,
+			privateKeys,
+			new DateTimeProvider(),
+			config ?? new OAuth2Configuration()
+		) {
+			config.CheckSanity();
+		}
+
 		async Task<D2LSecurityToken> IPrivateKeyProvider.GetSigningCredentialsAsync() {
 			var current = Volatile.Read( ref m_current );