Skip to content

add correlation id back when use msal #13070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saragluna merged 1 commit into from
Jul 13, 2020
Merged

add correlation id back when use msal #13070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...g-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/aad/AzureADGraphClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
Expand All @@ -51,6 +52,8 @@ public class AzureADGraphClient {
private static final String DEFAULT_ROLE_PREFIX = "ROLE_";
private static final String MICROSOFT_GRAPH_SCOPE = "https://graph.microsoft.com/user.read";
private static final String AAD_GRAPH_API_SCOPE = "https://graph.windows.net/user.read";
// We use "aadfeed5" as suffix when client library is ADAL, upgrade to "aadfeed6" for MSAL
private static final String REQUEST_ID_SUFFIX = "aadfeed6";

private final String clientId;
private final String clientSecret;
Expand Down Expand Up @@ -206,6 +209,7 @@ public IAuthenticationResult acquireTokenForGraphApi(String idToken, String tena
final ConfidentialClientApplication application = ConfidentialClientApplication
.builder(clientId, clientCredential)
.authority(serviceEndpoints.getAadSigninUri() + tenantId + "/")
.correlationId(getCorrelationId())
.build();

final Set<String> scopes = new HashSet<>();
Expand Down Expand Up @@ -238,4 +242,9 @@ public IAuthenticationResult acquireTokenForGraphApi(String idToken, String tena
}
return result;
}

private static String getCorrelationId() {
final String uuid = UUID.randomUUID().toString();
return uuid.substring(0, uuid.length() - REQUEST_ID_SUFFIX.length()) + REQUEST_ID_SUFFIX;
}
}