kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Properly ignore path prefix on omniauthable

Browse source
This commit is contained in:
José Valim 2011-03-14 18:35:06 +01:00
parent d58a72ee32
commit 1bf7da148a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.rdoc
View file

@ -1,3 +1,6 @@
* bug fix
* Properly ignore path prefix on omniauthable
== 1.2.rc2
* enhancements

5
lib/devise/rails/routes.rb
View file

@ -263,6 +263,7 @@ module ActionDispatch::Routing
end
def devise_omniauth_callback(mapping, controllers) #:nodoc:
path, @scope[:path] = @scope[:path], nil
path_prefix = "/#{mapping.path}/auth"
if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
@ -271,8 +272,10 @@ module ActionDispatch::Routing
::OmniAuth.config.path_prefix = path_prefix
end
match "/auth/:action/callback", :action => Regexp.union(mapping.to.omniauth_providers.map(&:to_s)),
match "#{path_prefix}/:action/callback", :action => Regexp.union(mapping.to.omniauth_providers.map(&:to_s)),
:to => controllers[:omniauth_callbacks], :as => :omniauth_callback
ensure
@scope[:path] = path
end
def with_devise_exclusive_scope(new_path, new_as) #:nodoc: