diff --git a/app/assets/javascripts/discourse/models/login_method.js b/app/assets/javascripts/discourse/models/login_method.js
index e969fefb0..074cdedf2 100644
--- a/app/assets/javascripts/discourse/models/login_method.js
+++ b/app/assets/javascripts/discourse/models/login_method.js
@@ -26,12 +26,7 @@ Discourse.LoginMethod.reopenClass({
var methods = this.methods = Em.A();
- /*
- * enable_google_logins etc.
- * */
-
- [ "google",
- "google_oauth2",
+ [ "google_oauth2",
"facebook",
"cas",
"twitter",
@@ -42,7 +37,7 @@ Discourse.LoginMethod.reopenClass({
var params = {name: name};
- if (name === "google" || name === "google_oauth2") {
+ if (name === "google_oauth2") {
params.frameWidth = 850;
params.frameHeight = 500;
} else if (name === "facebook") {
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 2e235935b..bb33159a4 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -7,7 +7,6 @@ class Users::OmniauthCallbacksController < ApplicationController
BUILTIN_AUTH = [
Auth::FacebookAuthenticator.new,
- Auth::OpenIdAuthenticator.new("google", "https://www.google.com/accounts/o8/id", trusted: true),
Auth::GoogleOAuth2Authenticator.new,
Auth::OpenIdAuthenticator.new("yahoo", "https://me.yahoo.com", trusted: true),
Auth::GithubAuthenticator.new,
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index bd18bb92e..04c199b40 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -27,8 +27,6 @@ class AdminDashboardData
gc_checks,
sidekiq_check,
ram_check,
- old_google_config_check,
- both_googles_config_check,
google_oauth2_config_check,
facebook_config_check,
twitter_config_check,
@@ -103,14 +101,6 @@ class AdminDashboardData
I18n.t('dashboard.memory_warning') if MemInfo.new.mem_total and MemInfo.new.mem_total < 1_000_000
end
- def old_google_config_check
- I18n.t('dashboard.enable_google_logins_warning') if SiteSetting.enable_google_logins
- end
-
- def both_googles_config_check
- I18n.t('dashboard.both_googles_warning') if SiteSetting.enable_google_logins && SiteSetting.enable_google_oauth2_logins
- end
-
def google_oauth2_config_check
I18n.t('dashboard.google_oauth2_config_warning') if SiteSetting.enable_google_oauth2_logins && (SiteSetting.google_oauth2_client_id.blank? || SiteSetting.google_oauth2_client_secret.blank?)
end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 71cbbcd34..4e6222ed1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -682,8 +682,6 @@ en:
gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.'
- enable_google_logins_warning: "WARNING! Support is ending for your current method of Google authentication on April 20, 2015! Please <a href='https://meta.discourse.org/t/configuring-google-login-for-discourse/15858' target='_blank'>switch to the new method now!</a>"
- both_googles_warning: "You have both enable_google_logins and enable_google_oauth2_logins checked in the site settings. Disable enable_google_logins."
google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">See this guide to learn more</a>.'
facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">See this guide to learn more</a>.'
twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">See this guide to learn more</a>.'
@@ -892,7 +890,6 @@ en:
enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)"
allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
- enable_google_logins: "(deprecated) Enable Google authentication. This is the OpenID method of authentication which Google has deprecated. New installs will NOT work with this. Use Google Oauth2 instead. Existing installs must move to Google Oauth2 by April 20, 2015."
enable_yahoo_logins: "Enable Yahoo authentication"
enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 150cee72e..aa38b98d2 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -188,11 +188,6 @@ login:
allow_new_registrations:
client: true
default: true
- # The default value of enable_google_logins changed from true to false.
- # See db/migrate/20140521220115_google_openid_default_has_changed.rb
- enable_google_logins:
- client: true
- default: false
enable_google_oauth2_logins:
client: true
default: false