commit a8674708315a53db06de22a11589dff301846318
author David Ostrovsky <david@ostrovsky.org> Tue Feb 05 08:57:56 2019 +0100
committer David Ostrovsky <david@ostrovsky.org> Tue Feb 05 08:58:08 2019 +0100
tree f4c03f2c98317d5c6f57f7d42dd784dd84dc62a7
parent f4789f675a41be371535b5e65410d572a86d643c
parent a8b3d626a732aa3e2d668fa0897b67699e92fdf8

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  GoogleOAuthService: Stop using deprecated Google+ userinfo endpoint

Change-Id: Ief5c44a6194e44cf450ded2dc85a5ccb60d17975

src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
index 66e6831..1199ea3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
@@ -54,8 +54,8 @@
   private static final Logger log = LoggerFactory.getLogger(GoogleOAuthService.class);
   static final String CONFIG_SUFFIX = "-google-oauth";
   private static final String GOOGLE_PROVIDER_PREFIX = "google-oauth:";
-  private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/userinfo/v2/me";
-  // "https://www.googleapis.com/plus/v1/people/me/openIdConnect";
+  private static final String PROTECTED_RESOURCE_URL =
+      "https://www.googleapis.com/oauth2/v2/userinfo";
   private static final String SCOPE = "email profile";
   private final OAuthService service;
   private final String canonicalWebUrl;