Skip to content

Commit 54e9bb0

Browse files
committed
Change cloudshell request method from post to get
1 parent fb02867 commit 54e9bb0

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ public ManagedIdentityResponse getManagedIdentityResponse(
4949
IHttpResponse response;
5050

5151
try {
52-
53-
HttpRequest httpRequest = managedIdentityRequest.method.equals(HttpMethod.GET) ?
54-
new HttpRequest(HttpMethod.GET,
52+
HttpRequest httpRequest = StringHelper.isNullOrBlank(managedIdentityRequest.getBodyAsString()) ?
53+
new HttpRequest(managedIdentityRequest.method,
5554
managedIdentityRequest.computeURI().toString(),
5655
managedIdentityRequest.headers) :
57-
new HttpRequest(HttpMethod.POST,
56+
new HttpRequest(managedIdentityRequest.method,
5857
managedIdentityRequest.computeURI().toString(),
5958
managedIdentityRequest.headers,
6059
managedIdentityRequest.getBodyAsString());

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ class CloudShellManagedIdentitySource extends AbstractManagedIdentitySource{
2020
@Override
2121
public void createManagedIdentityRequest(String resource) {
2222
managedIdentityRequest.baseEndpoint = msiEndpoint;
23-
managedIdentityRequest.method = HttpMethod.POST;
23+
managedIdentityRequest.method = HttpMethod.GET;
2424

2525
managedIdentityRequest.headers = new HashMap<>();
2626
managedIdentityRequest.headers.put("ContentType", "application/x-www-form-urlencoded");
2727
managedIdentityRequest.headers.put("Metadata", "true");
28-
managedIdentityRequest.headers.put("resource", resource);
2928

3029
managedIdentityRequest.bodyParameters = new HashMap<>();
3130
managedIdentityRequest.bodyParameters.put("resource", Collections.singletonList(resource));
31+
32+
managedIdentityRequest.queryParameters = new HashMap<>();
33+
managedIdentityRequest.queryParameters.put("resource", Collections.singletonList(resource));
3234
}
3335

3436
private CloudShellManagedIdentitySource(MsalRequest msalRequest, ServiceBundle serviceBundle, URI msiEndpoint)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,11 @@ private HttpRequest expectedRequest(ManagedIdentitySourceType source, String res
8686

8787
headers.put("ContentType", "application/x-www-form-urlencoded");
8888
headers.put("Metadata", "true");
89-
headers.put("resource", resource);
9089

9190
bodyParameters.put("resource", Collections.singletonList(resource));
92-
return new HttpRequest(HttpMethod.POST, computeUri(endpoint, queryParameters), headers, URLUtils.serializeParameters(bodyParameters));
91+
92+
queryParameters.put("resource", Collections.singletonList(resource));
93+
return new HttpRequest(HttpMethod.GET, computeUri(endpoint, queryParameters), headers, URLUtils.serializeParameters(bodyParameters));
9394
}
9495
case IMDS: {
9596
endpoint = IMDS_ENDPOINT;

0 commit comments

Comments
 (0)