Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6540 from vinothkannans/ios-safari-fix 

FIX: Flash authentication data not rendered in latest iOS safari browser
This commit is contained in:
Vinoth Kannan 2018-10-30 04:35:07 +05:30 committed by GitHub
parent f8305f53c7 92bf3c667e
commit ead6600f4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -454,7 +454,7 @@ class ApplicationController < ActionController::Base
end end
def can_cache_content? def can_cache_content?
current_user.blank? && flash[:authentication_data].blank? current_user.blank? && cookies[:authentication_data].blank?
end end
# Our custom cache method # Our custom cache method

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

@ -67,7 +67,7 @@ class Users::OmniauthCallbacksController < ApplicationController
if (provider && provider.full_screen_login) || cookies['fsl'] if (provider && provider.full_screen_login) || cookies['fsl']
cookies.delete('fsl') cookies.delete('fsl')
cookies['_bypass_cache'] = true cookies['_bypass_cache'] = true
flash[:authentication_data] = @auth_result.to_client_hash.to_json cookies[:authentication_data] = @auth_result.to_client_hash.to_json
redirect_to @origin redirect_to @origin
else else
respond_to do |format| respond_to do |format|

4
app/views/layouts/application.html.erb
View File

@ -56,8 +56,8 @@
<%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %> <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
<%- if !current_user && flash[:authentication_data] %> <%- if !current_user && cookies[:authentication_data] %>
<meta id="data-authentication" data-authentication-data="<%= flash[:authentication_data] %>"> <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
<%= preload_script "authentication-complete" %> <%= preload_script "authentication-complete" %>
<%- end %> <%- end %>
</head> </head>