commit | 48e314533fdea8f6f191516847fc4008f5baaa1f | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Jul 01 20:29:48 2020 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Jul 01 20:29:48 2020 -0400 |
tree | 0d5eb7b30b135d43caf7464375bb4b38dab69640 | |
parent | 0e69d90f9e7035f2a5f88cc167998b08449e9200 [diff] | |
parent | 7b218688cf83d3488db17b4ae1a1fa501e921152 [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Office365OAuthService: Restore Accept header in user info request Upgrade bazlets to latest stable-2.16 Change-Id: Idfe4c098c23512e416ba2534e754c562eae6f8d0
diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java index c1380bc..4e0803b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java +++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
@@ -80,6 +80,7 @@ OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL); OAuth2AccessToken t = new OAuth2AccessToken(token.getToken(), token.getRaw()); service.signRequest(t, request); + request.addHeader("Accept", "*/*"); JsonElement userJson = null; try (Response response = service.execute(request)) {