| commit | 7b218688cf83d3488db17b4ae1a1fa501e921152 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Wed Jul 01 13:20:43 2020 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Wed Jul 01 13:20:43 2020 -0400 |
| tree | 582194bd238757d8accff651e8dca8d7ec82a19e | |
| parent | 27cc24bf577154c7aa63ac02a129c417fb405c1d [diff] | |
| parent | fd6f75c980b34a8c6f569e4ee1c19b3cd9eebf14 [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Office365OAuthService: Restore Accept header in user info request Upgrade bazlets to latest stable-2.16 Change-Id: I1ad838dd83c60c8a513a999c5b72968087001c46
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)) {