From f74d6bb605f0395f4cba5e69d3c32206ca7c39a8 Mon Sep 17 00:00:00 2001
From: Geoffrey Challen <challen@illinois.edu>
Date: Thu, 11 Jan 2018 14:14:31 -0600
Subject: [PATCH] Add prompt and HD settings to the Google OAuth2 plugin.

---
 config/site_settings.yml                | 8 ++++++++
 lib/auth/google_oauth2_authenticator.rb | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 744ae92ba5b..d57e111be94 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -255,6 +255,14 @@ 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 dcee38d217f..67200adcab7 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -59,7 +59,9 @@ 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
+           skip_jwt: true,
+           prompt: SiteSetting.google_oauth2_prompt,
+           hd: SiteSetting.google_oauth2_hd
   end
 
   protected