commit d79fe1c18171d5241f79f4e89c17c93aeb8b46c8
author Luca Milanesio <luca.milanesio@gmail.com> Wed Aug 13 07:52:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 12 19:14:56 2014 +0000
tree 95b5f2debe643db8d7e6c15cf378695fab55d2a1
parent 8a6244295cee4d9c6e530a40267b60568842d7d1
parent 354be61207c53bbcc4cb7ee3daf224b6888f3acb

Merge "Fix OAuth callback URL for non-root Gerrit canonical URL"

github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java

diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
index 36d9718..14cce5c 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
@@ -36,7 +36,7 @@
   protected static final String CONF_SECTION = "github";
   private static final String LOGIN_OAUTH_AUTHORIZE = "/login/oauth/authorize";
   private static final String GITHUB_URL = "https://github.com";
-  public static final String OAUTH_FINAL = "/oauth";
+  public static final String OAUTH_FINAL = "oauth";
   public static final String LOGIN_OAUTH_ACCESS_TOKEN =
       "/login/oauth/access_token";
   public static final String OAUTH_LOGIN = "/login";
@@ -112,14 +112,9 @@
     return scopes;
   }
 
-  public String getUrl(String baseUrl, String path)
+  private static String getUrl(String baseUrl, String path)
       throws MalformedURLException {
-    if (baseUrl.indexOf("://") > 0) {
       return new URL(new URL(baseUrl), path).toExternalForm();
-    } else {
-      return baseUrl + (baseUrl.endsWith("/") ? "" : "/")
-          + (path.startsWith("/") ? path.substring(1) : path);
-    }
   }
 
   public Scope[] getDefaultScopes() {