Skip to content

Use the dedicated admin consent endpoint instead of a query parameter #599

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
Avery-Dunn merged 1 commit into from
Feb 23, 2023
Merged

Use the dedicated admin consent endpoint instead of a query parameter #599

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
12 changes: 11 additions & 1 deletion msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthorizationRequestUrlParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public class AuthorizationRequestUrlParameters {
private String correlationId;
private boolean instanceAware;

//Unlike other prompts (which are sent as query parameters), admin consent has its own endpoint format
private static final String ADMIN_CONSENT_ENDPOINT = "https://login.microsoftonline.com/{tenant}/adminconsent";

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

public static Builder builder(String redirectUri,
Expand Down Expand Up @@ -155,7 +158,14 @@ URL createAuthorizationURL(Authority authority,
Map<String, List<String>> requestParameters) {
URL authorizationRequestUrl;
try {
String authorizationCodeEndpoint = authority.authorizationEndpoint();
String authorizationCodeEndpoint;
if (prompt == Prompt.ADMIN_CONSENT) {
authorizationCodeEndpoint = ADMIN_CONSENT_ENDPOINT
.replace("{tenant}", authority.tenant);
} else {
authorizationCodeEndpoint = authority.authorizationEndpoint();
}

String uriString = authorizationCodeEndpoint + "?" +
URLUtils.serializeParameters(requestParameters);

Expand Down
8 changes: 0 additions & 8 deletions msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/Prompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ public enum Prompt {
*/
CONSENT("consent"),

/**
* An administrator should be prompted to consent on behalf of all users in their organization.
* <p>
* Deprecated, instead use Prompt.ADMIN_CONSENT
*/
@Deprecated
ADMING_CONSENT("admin_consent"),

/**
* An administrator should be prompted to consent on behalf of all users in their organization.
*/
Expand Down