Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Facebook Graph 2.0 login + better strategy error handling #76

Merged
merged 4 commits into from
Jan 6, 2015
+28 −8
Merged

Facebook Graph 2.0 login + better strategy error handling #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc56608
Use Facebook login through graph v2 api
skogsmaskin Jan 5, 2015
e572e92
Transfer error message
skogsmaskin Jan 5, 2015
98c0d1c
Pass through any optional params
skogsmaskin Jan 6, 2015
5e3e080
Pass through the original strategy callback error for easier debuggin…
skogsmaskin Jan 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem 'rails-observers', '~> 0.1', require: false
gem 'pg', '~> 0.17'
gem 'omniauth', '~> 1.1.4'
gem 'omniauth-twitter', :git => 'git://github.com/arunagw/omniauth-twitter.git'
gem 'omniauth-facebook', '~> 1.4.1'
gem 'omniauth-facebook', '~> 1.6'
gem 'omniauth-contrib', '~> 1.0.0', :git => 'git://github.com/intridea/omniauth-contrib.git'
gem 'omniauth-oauth', '~> 1.0.1', :git => 'git://github.com/intridea/omniauth-oauth.git'
gem 'omniauth-oauth2', '~> 1.1.0', :git => 'git://github.com/intridea/omniauth-oauth2.git'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ GEM
evernote-thrift
multi_json (~> 1.0)
omniauth-oauth (~> 1.0)
omniauth-facebook (1.4.1)
omniauth-oauth2 (~> 1.1.0)
omniauth-facebook (1.6.0)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.1.19)
omniauth (~> 1.0)
omniauth-oauth2
Expand Down Expand Up @@ -231,7 +231,7 @@ DEPENDENCIES
omniauth (~> 1.1.4)
omniauth-contrib (~> 1.0.0)!
omniauth-evernote
omniauth-facebook (~> 1.4.1)
omniauth-facebook (~> 1.6)
omniauth-google-oauth2 (~> 0.1.10)
omniauth-oauth (~> 1.0.1)!
omniauth-oauth2 (~> 1.1.0)!
Expand Down
12 changes: 10 additions & 2 deletions api/v1/auth.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,14 @@ def url_for_failure(params = {})
service_keys = current_realm.keys_for(params[:provider].to_sym)

strategy.options[:force_dialog] = session[:force_dialog]
strategy.options[:display] = session[:display] if params[:provider] == 'facebook'
if params[:provider] == 'facebook'
strategy.options[:display] = session[:display]
strategy.options[:client_options] ||= {}
strategy.options[:client_options] = strategy.options[:client_options].merge({
:site => 'https://graph.facebook.com/v2.0',
:authorize_url => "https://www.facebook.com/v2.0/dialog/oauth"
})
end
strategy.options[:target_url] = session[:redirect_to]

if strategy.options.respond_to?(:consumer_key)
Expand Down Expand Up @@ -188,7 +195,8 @@ def url_for_failure(params = {})
end

get '/auth/failure' do
redirect url_for_failure(:message => params[:message] || 'unknown')
params[:message] ||= 'unknown'
redirect url_for_failure(params)
end

# FIXME: Should not offer this as GET.
Expand Down
16 changes: 14 additions & 2 deletions config.ru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,20 @@ map "/api/checkpoint/v1" do
provider :evernote, nil, nil, :setup => true

on_failure do |env|
message_key = env['omniauth.error.type']
new_path = "/api/checkpoint/v1/auth/failure?message=#{message_key}"
message_key = env['omniauth.error.type'] # Generic omniauth error, i.e. 'invalid_credentials'

# Pass through the original strategy callback error for easier debugging and error handling
query_hash = env['rack.request.query_hash']
strategy_error = nil
if query_hash and query_hash['error']
error_hash = {
'error' => query_hash['error'],
'error_reason' => query_hash['error_reason'],
'error_description' => query_hash['error_description']
}
strategy_error = "&#{error_hash.to_param}"
end
new_path = "/api/checkpoint/v1/auth/failure?message=#{message_key}#{strategy_error}"
[302, {'Location' => new_path, 'Content-Type'=> 'text/html'}, []]
end
end
Expand Down