From 1c790ae6bc2b53b6075db0deb52ae42258203afb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 22 Feb 2018 19:17:02 +0100
Subject: [PATCH] Revert "Add prompt and HD settings to the Google OAuth2
 plugin."

This reverts commit f74d6bb605f0395f4cba5e69d3c32206ca7c39a8.
---
 config/site_settings.yml                | 8 --------
 lib/auth/google_oauth2_authenticator.rb | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index d57e111be94..744ae92ba5b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -255,14 +255,6 @@ login:
     default: false
   google_oauth2_client_id: ''
   google_oauth2_client_secret: ''
-  google_oauth2_prompt:
-    default: 'none'
-    type: enum
-    choices:
-      - 'none'
-      - 'consent'
-      - 'select_account'
-  google_oauth2_hd: ''
   enable_yahoo_logins:
     client: true
     default: false
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index 67200adcab7..dcee38d217f 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -59,9 +59,7 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
               strategy.options[:client_id] = SiteSetting.google_oauth2_client_id
               strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret
            },
-           skip_jwt: true,
-           prompt: SiteSetting.google_oauth2_prompt,
-           hd: SiteSetting.google_oauth2_hd
+           skip_jwt: true
   end
 
   protected