Skip to content

Commit 6106d52

Browse files
committed
Replace exception with warning
1 parent e6daa31 commit 6106d52

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthorizationRequestUrlParameters.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import lombok.Getter;
88
import lombok.NonNull;
99
import lombok.experimental.Accessors;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
1012

1113
import java.net.MalformedURLException;
1214
import java.net.URL;
@@ -41,6 +43,8 @@ public class AuthorizationRequestUrlParameters {
4143

4244
Map<String, List<String>> requestParameters = new HashMap<>();
4345

46+
Logger log = LoggerFactory.getLogger(AuthorizationRequestUrlParameters.class);
47+
4448
public static Builder builder(String redirectUri,
4549
Set<String> scopes) {
4650

@@ -161,7 +165,7 @@ private AuthorizationRequestUrlParameters(Builder builder) {
161165
String key = entry.getKey();
162166
String value = entry.getValue();
163167
if(requestParameters.containsKey(key)){
164-
throw new MsalClientException("Conflicting parameters", "400 - Bad Request");
168+
log.warn("A query parameter {} has been provided with values multiple times.", key);
165169
}
166170
requestParameters.put(key, Collections.singletonList(value));
167171
}

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class TokenRequestExecutor {
3434

3535
AuthenticationResult executeTokenRequest() throws ParseException, IOException {
3636

37-
log.debug("Sending token request to: " + requestAuthority.canonicalAuthorityUrl());
37+
log.debug("Sending token request to: {}", requestAuthority.canonicalAuthorityUrl());
3838
OAuthHttpRequest oAuthHttpRequest = createOauthHttpRequest();
3939
HTTPResponse oauthHttpResponse = oAuthHttpRequest.send();
4040
return createAuthenticationResultFromOauthHttpResponse(oauthHttpResponse);
@@ -70,7 +70,7 @@ OAuthHttpRequest createOauthHttpRequest() throws SerializeException, MalformedUR
7070
if(msalRequest.requestContext().apiParameters().extraQueryParameters() != null ){
7171
for(String key: msalRequest.requestContext().apiParameters().extraQueryParameters().keySet()){
7272
if(params.containsKey(key)){
73-
throw new MsalClientException("Conflicting parameters","400 - Bad Request");
73+
log.warn("A query parameter {} has been provided with values multiple times.", key);
7474
}
7575
params.put(key, Collections.singletonList(msalRequest.requestContext().apiParameters().extraQueryParameters().get(key)));
7676
}

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AuthorizationRequestUrlParametersTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void testBuilder_invalidRequiredParameters() {
7878
.build();
7979
}
8080

81-
@Test(expectedExceptions = MsalClientException.class, expectedExceptionsMessageRegExp = "Conflicting parameters")
81+
@Test
8282
public void testBuilder_conflictingParameters() {
8383
PublicClientApplication app = PublicClientApplication.builder("client_id").build();
8484

0 commit comments

Comments
 (0)