Skip to content
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

Use path of the redirect URI #892

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Use path of the redirect URI #892

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AcquireTokenByInteractiveFlowSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ private AuthorizationResult getAuthorizationResult() {
AuthorizationResponseHandler authorizationResponseHandler =
new AuthorizationResponseHandler(
authorizationResultQueue,
systemBrowserOptions);
systemBrowserOptions,
interactiveRequest.interactiveRequestParameters().redirectUri());

startHttpListener(authorizationResponseHandler);

Expand Down
8 changes: 6 additions & 2 deletions msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthorizationResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.URI;
import java.util.concurrent.BlockingQueue;
import java.util.stream.Collectors;

Expand All @@ -34,17 +35,20 @@ class AuthorizationResponseHandler implements HttpHandler {

private BlockingQueue<AuthorizationResult> authorizationResultQueue;
private SystemBrowserOptions systemBrowserOptions;
private URI redirectUri;

AuthorizationResponseHandler(BlockingQueue<AuthorizationResult> authorizationResultQueue,
SystemBrowserOptions systemBrowserOptions) {
SystemBrowserOptions systemBrowserOptions, URI redirectUri) {
this.authorizationResultQueue = authorizationResultQueue;
this.systemBrowserOptions = systemBrowserOptions;
this.redirectUri = redirectUri;
}

@Override
public void handle(HttpExchange httpExchange) throws IOException {
try {
if (!httpExchange.getRequestURI().getPath().equalsIgnoreCase("/")) {
String expectedPath = redirectUri.getPath().isEmpty() ? "/" : redirectUri.getPath();
if (!httpExchange.getRequestURI().getPath().equalsIgnoreCase(expectedPath)) {
httpExchange.sendResponseHeaders(200, 0);
return;
}
Expand Down