From def2c977ceff38dab9ca0e227a684468f722de30 Mon Sep 17 00:00:00 2001
From: Nick Shearer <nick.shearer@quest.com>
Date: Wed, 25 Jul 2018 18:07:39 -0500
Subject: [PATCH] allow auth plugins to have a site setting for if they should
 be full screen vs popup window

---
 .../javascripts/discourse/models/login-method.js.es6 | 12 +++++++++++-
 lib/plugin/auth_provider.rb                          |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index da5282a4ab8..32771079367 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -47,7 +47,17 @@ const LoginMethod = Ember.Object.extend({
       customLogin();
     } else {
       let authUrl = this.get("customUrl") || Discourse.getURL("/auth/" + name);
-      if (this.get("fullScreenLogin")) {
+
+      // first check if this plugin has a site setting for full screen login before using the static setting
+      let fullScreenLogin = false;
+      const fullScreenLoginSetting = this.get("fullScreenLoginSetting");
+      if (!Ember.isEmpty(fullScreenLoginSetting)) {
+        fullScreenLogin = this.siteSettings[fullScreenLoginSetting];
+      } else {
+        fullScreenLogin = this.get("fullScreenLogin")
+      }
+
+      if (fullScreenLogin) {
         document.cookie = "fsl=true";
         window.location = authUrl;
       } else {
diff --git a/lib/plugin/auth_provider.rb b/lib/plugin/auth_provider.rb
index b44dfc16aa1..574962f9426 100644
--- a/lib/plugin/auth_provider.rb
+++ b/lib/plugin/auth_provider.rb
@@ -2,7 +2,8 @@ class Plugin::AuthProvider
 
   def self.auth_attributes
     [:glyph, :background_color, :pretty_name, :title, :message, :frame_width, :frame_height, :authenticator,
-     :pretty_name_setting, :title_setting, :enabled_setting, :full_screen_login, :custom_url]
+     :pretty_name_setting, :title_setting, :enabled_setting, :full_screen_login, :full_screen_login_setting,
+     :custom_url]
   end
 
   attr_accessor(*auth_attributes)
@@ -23,6 +24,7 @@ class Plugin::AuthProvider
     result['frameWidth'] = frame_width if frame_width
     result['frameHeight'] = frame_height if frame_height
     result['fullScreenLogin'] = full_screen_login if full_screen_login
+    result['fullScreenLoginSetting'] = full_screen_login_setting if full_screen_login_setting
     result.to_json
   end