Skip to content

Commit a93007d

Browse files
CopilotAvery-Dunn
andcommitted
Address code review feedback: fix parameter order and reduce redundant calls
Co-authored-by: Avery-Dunn <62066438+Avery-Dunn@users.noreply.github.com>
1 parent 69f13b7 commit a93007d

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ public ManagedIdentityResponse getManagedIdentityResponse(
5454
} catch (MsalClientException e) {
5555
if (e.getCause() instanceof SocketException) {
5656
String message = e.getMessage();
57+
String correlationId = managedIdentityRequest.requestContext().correlationId();
5758
LOG.error(LogHelper.createMessage(
5859
"[Managed Identity] Network unreachable: " + message,
59-
managedIdentityRequest.requestContext().correlationId()));
60+
correlationId));
6061
throw new MsalServiceException(message, MsalError.MANAGED_IDENTITY_UNREACHABLE_NETWORK,
61-
managedIdentityRequest.requestContext().correlationId());
62+
correlationId);
6263
}
6364

6465
throw e;
@@ -79,20 +80,22 @@ public ManagedIdentityResponse handleResponse(
7980
return getSuccessfulResponse(response);
8081
} else {
8182
message = getMessageFromErrorResponse(response);
83+
String correlationId = managedIdentityRequest.requestContext().correlationId();
8284
LOG.error(LogHelper.createMessage(
8385
String.format("[Managed Identity] request failed, HttpStatusCode: %s, Error message: %s",
8486
response.statusCode(), message),
85-
managedIdentityRequest.requestContext().correlationId()));
87+
correlationId));
8688
throw new MsalServiceException(message, AuthenticationErrorCode.MANAGED_IDENTITY_REQUEST_FAILED,
87-
managedIdentityRequest.requestContext().correlationId());
89+
correlationId);
8890
}
8991
} catch (Exception e) {
9092
if (!(e instanceof MsalServiceException)) {
9193
message = String.format("[Managed Identity] Unexpected exception occurred when parsing the response, HttpStatusCode: %s, Error message: %s",
9294
response.statusCode(), e.getMessage());
93-
LOG.error(LogHelper.createMessage(message, managedIdentityRequest.requestContext().correlationId()));
95+
String correlationId = managedIdentityRequest.requestContext().correlationId();
96+
LOG.error(LogHelper.createMessage(message, correlationId));
9497
throw new MsalServiceException(message, AuthenticationErrorCode.MANAGED_IDENTITY_REQUEST_FAILED,
95-
managedIdentityRequest.requestContext().correlationId());
98+
correlationId);
9699
} else {
97100
throw e;
98101
}
@@ -114,9 +117,10 @@ protected ManagedIdentityResponse getSuccessfulResponse(IHttpResponse response)
114117
|| managedIdentityResponse.getAccessToken().isEmpty() || managedIdentityResponse.getExpiresOn() == null
115118
|| managedIdentityResponse.getExpiresOn().isEmpty()) {
116119
String message = "[Managed Identity] Response is either null or insufficient for authentication.";
117-
LOG.error(LogHelper.createMessage(message, managedIdentityRequest.requestContext().correlationId()));
120+
String correlationId = managedIdentityRequest.requestContext().correlationId();
121+
LOG.error(LogHelper.createMessage(message, correlationId));
118122
throw new MsalServiceException(message, MsalError.MANAGED_IDENTITY_REQUEST_FAILED,
119-
managedIdentityRequest.requestContext().correlationId());
123+
correlationId);
120124
}
121125

122126
return managedIdentityResponse;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ AuthenticationResult execute() throws Exception {
3232
"[Managed Identity] " + message,
3333
msalRequest.requestContext().correlationId()));
3434
throw new MsalClientException(
35-
MsalError.RESOURCE_REQUIRED_MANAGED_IDENTITY,
3635
message,
36+
MsalError.RESOURCE_REQUIRED_MANAGED_IDENTITY,
3737
msalRequest.requestContext().correlationId());
3838
}
3939

0 commit comments

Comments
 (0)