github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up implementation of non frame login / registration

Browse Source
This commit is contained in:
Sam
2015-10-13 14:49:09 +11:00
parent fab51496cb
commit b6c2aa13e6
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ class Users::OmniauthCallbacksController < ApplicationController
auth[:session] = session
authenticator = self.class.find_authenticator(params[:provider])
provider = Discourse.auth_providers && Discourse.auth_providers.find{|p| p.name == params[:provider]}
@auth_result = authenticator.after_authenticate(auth)
@ -54,9 +55,15 @@ class Users::OmniauthCallbacksController < ApplicationController
else
@auth_result.authenticator_name = authenticator.name
complete_response_data
respond_to do |format|
format.html
format.json { render json: @auth_result.to_client_hash }
if provider && provider.full_screen_login
flash[:authentication_data] = @auth_result.to_client_hash.to_json
redirect_to @origin
else
respond_to do |format|
format.html
format.json { render json: @auth_result.to_client_hash }
end
end
end
end