github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 09:08:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: fullscreen login set from client needs to be respected

Browse Source
This commit is contained in:
Sam
2016-08-29 10:13:32 +10:00
parent 2251104e32
commit 22b8c0d44e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -132,6 +132,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
} else { } else {
const authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name); const authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name);
if (loginMethod.get("fullScreenLogin")) { if (loginMethod.get("fullScreenLogin")) {
document.cookie = "fsl=true";
window.location = authUrl; window.location = authUrl;
} else { } else {
this.set('authenticate', name); this.set('authenticate', name);

3
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -57,7 +57,8 @@ class Users::OmniauthCallbacksController < ApplicationController
@auth_result.authenticator_name = authenticator.name @auth_result.authenticator_name = authenticator.name
complete_response_data complete_response_data
if provider && provider.full_screen_login if provider && (provider.full_screen_login || cookies['fsl'])
cookies.delete('fsl')
cookies['_bypass_cache'] = true cookies['_bypass_cache'] = true
flash[:authentication_data] = @auth_result.to_client_hash.to_json flash[:authentication_data] = @auth_result.to_client_hash.to_json
redirect_to @origin redirect_to @origin