diff --git a/Documentation/config-contact.txt b/Documentation/config-contact.txt index 58df8eab02..e0795be19e 100644 --- a/Documentation/config-contact.txt +++ b/Documentation/config-contact.txt @@ -142,7 +142,6 @@ Date: 2009-02-23 20:32:32.852 UTC Full-Name: John Doe Preferred-Email: jdoe@example.com Identity: jd15@some-isp.com -Identity: jdoe@example.com Identity: jdoe@example.com Address: 123 Any Street diff --git a/Documentation/config-sso.txt b/Documentation/config-sso.txt index 8c82091d50..e4cf20e7aa 100644 --- a/Documentation/config-sso.txt +++ b/Documentation/config-sso.txt @@ -43,9 +43,9 @@ will match any OpenID provider on the Internet: * `http://` -- trust all OpenID providers using the HTTP protocol * `https://` -- trust all OpenID providers using the HTTPS protocol -To trust only Google Accounts: +To trust only Yahoo!: ==== - git config --file $site_path/etc/gerrit.config auth.trustedOpenID 'https://www.google.com/accounts/o8/id?id=' + git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://me.yahoo.com ==== === Database Schema diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java index 706f465a25..ba0bb7585e 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java @@ -19,6 +19,4 @@ public class OpenIdUrls { public static final String LASTID_COOKIE = "gerrit.last_openid"; public static final String URL_YAHOO = "https://me.yahoo.com"; - public static final String URL_GOOGLE = - "https://www.google.com/accounts/o8/id"; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java index a84ca99323..cb49f12f75 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java @@ -243,7 +243,7 @@ public class MyIdentitiesScreen extends SettingsScreen { // return ""; - } else if (k.isScheme(OpenIdUrls.URL_GOOGLE)) { + } else if (k.isScheme("https://www.google.com/accounts/o8/id")) { return OpenIdUtil.C.nameGoogle(); } else if (k.isScheme(OpenIdUrls.URL_YAHOO)) { diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java index 92ee908c04..e03842b092 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java @@ -56,7 +56,6 @@ import javax.servlet.http.HttpServletResponse; class LoginForm extends HttpServlet { private static final Logger log = LoggerFactory.getLogger(LoginForm.class); private static final ImmutableMap ALL_PROVIDERS = ImmutableMap.of( - "google", OpenIdUrls.URL_GOOGLE, "yahoo", OpenIdUrls.URL_YAHOO); private final ImmutableSet suggestProviders; diff --git a/gerrit-openid/src/main/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html b/gerrit-openid/src/main/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html index f5734ffe45..0a2d6abe9d 100644 --- a/gerrit-openid/src/main/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html +++ b/gerrit-openid/src/main/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html @@ -57,10 +57,6 @@ Cancel -