From 22b8c0d44ee2f75042a6848460f49ab3758dbd22 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 29 Aug 2016 10:13:32 +1000 Subject: [PATCH] FIX: fullscreen login set from client needs to be respected --- app/assets/javascripts/discourse/controllers/login.js.es6 | 1 + app/controllers/users/omniauth_callbacks_controller.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6 index f2ba67bb61a..611a90045ae 100644 --- a/app/assets/javascripts/discourse/controllers/login.js.es6 +++ b/app/assets/javascripts/discourse/controllers/login.js.es6 @@ -132,6 +132,7 @@ export default Ember.Controller.extend(ModalFunctionality, { } else { const authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name); if (loginMethod.get("fullScreenLogin")) { + document.cookie = "fsl=true"; window.location = authUrl; } else { this.set('authenticate', name); diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 0c151cf29a5..6a0f368d005 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -57,7 +57,8 @@ class Users::OmniauthCallbacksController < ApplicationController @auth_result.authenticator_name = authenticator.name complete_response_data - if provider && provider.full_screen_login + if provider && (provider.full_screen_login || cookies['fsl']) + cookies.delete('fsl') cookies['_bypass_cache'] = true flash[:authentication_data] = @auth_result.to_client_hash.to_json redirect_to @origin