simplify login name check

Brightspace · Sep 20, 2024 · fa1fd6d · fa1fd6d
1 parent f46d800
commit fa1fd6d
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/D2L.Bmx/OktaAuthenticator.cs b/src/D2L.Bmx/OktaAuthenticator.cs
@@ -217,27 +217,19 @@ consider running the command again with the '--experimental-bypass-browser-secur
 
 		var oktaAuthenticatedClient = oktaClientFactory.CreateAuthenticatedClient( orgUrl, sessionId );
 		var oktaSession = await oktaAuthenticatedClient.GetCurrentOktaSessionAsync();
-		if( !OktaUserMatchesProvided( oktaSession.Login, user ) ) {
+		string sessionLogin = oktaSession.Login.Split( "@" )[0];
+		string providedLogin = user.Split( "@" )[0];
+		if( !sessionLogin.Equals( providedLogin, StringComparison.OrdinalIgnoreCase ) ) {
 			consoleWriter.WriteWarning(
 				"WARNING: Could not automatically sign in to Okta as provided Okta user "
-				+ $"'{StripLoginDomain( user )}' does not match user '{StripLoginDomain( oktaSession.Login )}'." );
+				+ $"'{sessionLogin}' does not match user '{providedLogin}'." );
 			return null;
 		}
 
 		TryCacheOktaSession( user, orgUrl.Host, sessionId, oktaSession.ExpiresAt );
 		return oktaAuthenticatedClient;
 	}
 
-	private static string StripLoginDomain( string email ) {
-		return email.Contains( '@' ) ? email.Split( '@' )[0] : email;
-	}
-
-	private static bool OktaUserMatchesProvided( string oktaLogin, string providedUser ) {
-		string adName = StripLoginDomain( oktaLogin );
-		string normalizedUser = StripLoginDomain( providedUser );
-		return adName.Equals( normalizedUser, StringComparison.OrdinalIgnoreCase );
-	}
-
 	private bool TryCacheOktaSession( string userId, string org, string sessionId, DateTimeOffset expiresAt ) {
 		if( File.Exists( BmxPaths.CONFIG_FILE_NAME ) ) {
 			CacheOktaSession( userId, org, sessionId, expiresAt );