Skip to content

Commit 537bead

Browse files
committed
PR test fixes
1 parent feab34d commit 537bead

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,7 @@ public static void validateCreateOidcCredential(@Nullable final char[] password)
573573

574574
@VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PACKAGE)
575575
public static void validateBeforeUse(final MongoCredential credential) {
576-
AuthenticationMechanism mechanism = credential.getAuthenticationMechanism();
577576
String userName = credential.getUserName();
578-
assertTrue(mechanism == AuthenticationMechanism.MONGODB_OIDC);
579577
Object providerName = credential.getMechanismProperty(PROVIDER_NAME_KEY, null);
580578
Object requestCallback = credential.getMechanismProperty(REQUEST_TOKEN_CALLBACK_KEY, null);
581579
Object refreshCallback = credential.getMechanismProperty(REFRESH_TOKEN_CALLBACK_KEY, null);

driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,18 @@ private MongoCredential getMongoCredential() {
113113
MongoCredential credential = connectionString.getCredential();
114114
if (credential != null) {
115115
BsonArray callbacks = (BsonArray) getExpectedValue("callback");
116-
if (callbacks != null) {
117-
for (BsonValue v : callbacks) {
118-
String string = ((BsonString) v).getValue();
119-
if ("oidcRequest".equals(string)) {
120-
credential = credential.withMechanismProperty(
121-
REQUEST_TOKEN_CALLBACK_KEY,
122-
(MongoCredential.OidcRequestCallback) (context) -> null);
123-
} else if ("oidcRefresh".equals(string)) {
124-
credential = credential.withMechanismProperty(
125-
REFRESH_TOKEN_CALLBACK_KEY,
126-
(MongoCredential.OidcRefreshCallback) (context) -> null);
127-
} else {
128-
fail("Unsupported callback: " + string);
129-
}
116+
for (BsonValue v : callbacks) {
117+
String string = ((BsonString) v).getValue();
118+
if ("oidcRequest".equals(string)) {
119+
credential = credential.withMechanismProperty(
120+
REQUEST_TOKEN_CALLBACK_KEY,
121+
(MongoCredential.OidcRequestCallback) (context) -> null);
122+
} else if ("oidcRefresh".equals(string)) {
123+
credential = credential.withMechanismProperty(
124+
REFRESH_TOKEN_CALLBACK_KEY,
125+
(MongoCredential.OidcRefreshCallback) (context) -> null);
126+
} else {
127+
fail("Unsupported callback: " + string);
130128
}
131129
}
132130
OidcAuthenticator.OidcValidator.validateBeforeUse(credential);

0 commit comments

Comments
 (0)