Use an exact type match to consider base type as unsupported

Brightspace · Jul 8, 2024 · b57bf15 · b57bf15
1 parent 19413d4
commit b57bf15
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/src/D2L.Bmx/ConsolePrompter.cs b/src/D2L.Bmx/ConsolePrompter.cs
@@ -12,7 +12,7 @@ internal interface IConsolePrompter {
 	int? PromptDuration();
 	string PromptAccount( string[] accounts );
 	string PromptRole( string[] roles );
-	OktaMfaFactor SelectMfa( OktaMfaFactor[] mfaOptions );
+	UnsupportedOktaMfaFactor SelectMfa( UnsupportedOktaMfaFactor[] mfaOptions );
 	string GetMfaResponse( string mfaInputPrompt, bool maskInput );
 }
 
@@ -122,7 +122,7 @@ string IConsolePrompter.PromptRole( string[] roles ) {
 		return roles[index - 1];
 	}
 
-	OktaMfaFactor IConsolePrompter.SelectMfa( OktaMfaFactor[] mfaOptions ) {
+	UnsupportedOktaMfaFactor IConsolePrompter.SelectMfa( UnsupportedOktaMfaFactor[] mfaOptions ) {
 		Console.Error.WriteLine( "MFA Required" );
 
 		if( mfaOptions.Length == 0 ) {

diff --git a/src/D2L.Bmx/Okta/Models/AuthenticateResponse.cs b/src/D2L.Bmx/Okta/Models/AuthenticateResponse.cs
@@ -3,7 +3,7 @@
 namespace D2L.Bmx.Okta.Models;
 
 internal abstract record AuthenticateResponse {
-	public record MfaRequired( string StateToken, OktaMfaFactor[] Factors ) : AuthenticateResponse;
+	public record MfaRequired( string StateToken, UnsupportedOktaMfaFactor[] Factors ) : AuthenticateResponse;
 	public record Success( string SessionToken ) : AuthenticateResponse;
 }
 
@@ -18,36 +18,35 @@ internal record AuthenticateResponseRaw(
 );
 
 internal record AuthenticateResponseEmbedded(
-	OktaMfaFactor[]? Factors
+	UnsupportedOktaMfaFactor[]? Factors
 );
 
 [JsonPolymorphic(
 	TypeDiscriminatorPropertyName = "factorType",
 	IgnoreUnrecognizedTypeDiscriminators = true
 )]
-[JsonDerivedType( typeof( OktaMfaQuestionFactor ), OktaMfaQuestionFactor.FactorType )]
+[JsonDerivedType( typeof( UnsupportedOktaMfaQuestionFactor ), UnsupportedOktaMfaQuestionFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaTokenFactor ), OktaMfaTokenFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaHardwareTokenFactor ), OktaMfaHardwareTokenFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaSoftwareTotpFactor ), OktaMfaSoftwareTotpFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaHotpFactor ), OktaMfaHotpFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaSmsFactor ), OktaMfaSmsFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaCallFactor ), OktaMfaCallFactor.FactorType )]
 [JsonDerivedType( typeof( OktaMfaEmailFactor ), OktaMfaEmailFactor.FactorType )]
-internal record OktaMfaFactor {
+internal abstract record UnsupportedOktaMfaFactor {
 	public required string Id { get; set; }
 	public required string Provider { get; set; }
 	public required string VendorName { get; set; }
 
-	public const string FactorType = "unknown";
 	[JsonIgnore]
 	public virtual string FactorName => "unknown";
 	[JsonIgnore]
 	public virtual bool RequireChallengeIssue => false;
 }
 
-internal record OktaMfaQuestionFactor(
+internal record UnsupportedOktaMfaQuestionFactor(
 	OktaMfaQuestionProfile Profile
-) : OktaMfaFactor {
+) : UnsupportedOktaMfaFactor {
 	public const string FactorType = "question";
 	public override string FactorName => "Security Question";
 }
@@ -56,39 +55,39 @@ internal record OktaMfaQuestionProfile(
 	string QuestionText
 );
 
-internal record OktaMfaTokenFactor() : OktaMfaFactor {
+internal record OktaMfaTokenFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "token";
 	public override string FactorName => "Token";
 }
 
-internal record OktaMfaHardwareTokenFactor() : OktaMfaFactor {
+internal record OktaMfaHardwareTokenFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "token:hardware";
 	public override string FactorName => "Hardware Token";
 }
 
-internal record OktaMfaSoftwareTotpFactor() : OktaMfaFactor {
+internal record OktaMfaSoftwareTotpFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "token:software:totp";
 	public override string FactorName => "Software TOTP";
 }
 
-internal record OktaMfaHotpFactor() : OktaMfaFactor {
+internal record OktaMfaHotpFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "token:hotp";
 	public override string FactorName => "HOTP";
 }
 
-internal record OktaMfaSmsFactor() : OktaMfaFactor {
+internal record OktaMfaSmsFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "sms";
 	public override string FactorName => "SMS";
 	public override bool RequireChallengeIssue => true;
 }
 
-internal record OktaMfaCallFactor() : OktaMfaFactor {
+internal record OktaMfaCallFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "call";
 	public override string FactorName => "Call";
 	public override bool RequireChallengeIssue => true;
 }
 
-internal record OktaMfaEmailFactor() : OktaMfaFactor {
+internal record OktaMfaEmailFactor : UnsupportedOktaMfaFactor {
 	public const string FactorType = "email";
 	public override string FactorName => "Email";
 	public override bool RequireChallengeIssue => true;

diff --git a/src/D2L.Bmx/OktaAuthenticator.cs b/src/D2L.Bmx/OktaAuthenticator.cs
@@ -55,9 +55,9 @@ bool ignoreCache
 		var authnResponse = await oktaApi.AuthenticateAsync( user, password );
 
 		if( authnResponse is AuthenticateResponse.MfaRequired mfaInfo ) {
-			OktaMfaFactor mfaFactor = consolePrompter.SelectMfa( mfaInfo.Factors );
+			UnsupportedOktaMfaFactor mfaFactor = consolePrompter.SelectMfa( mfaInfo.Factors );
 
-			if( mfaFactor.FactorName == OktaMfaFactor.FactorType ) {
+			if (mfaFactor.GetType() == typeof(UnsupportedOktaMfaFactor)) {
 				throw new BmxException( "Selected MFA not supported by BMX" );
 			}
 
@@ -67,8 +67,8 @@ bool ignoreCache
 			}
 
 			string mfaResponse = consolePrompter.GetMfaResponse(
-				mfaFactor is OktaMfaQuestionFactor questionFactor ? questionFactor.Profile.QuestionText : "PassCode",
-				mfaFactor is OktaMfaQuestionFactor // Security question factor is a static value
+				mfaFactor is UnsupportedOktaMfaQuestionFactor questionFactor ? questionFactor.Profile.QuestionText : "PassCode",
+				mfaFactor is UnsupportedOktaMfaQuestionFactor // Security question factor is a static value
 			);
 
 			authnResponse = await oktaApi.VerifyMfaChallengeResponseAsync( mfaInfo.StateToken, mfaFactor.Id, mfaResponse );