Properly ignore path prefix on omniauthable

twalpole · Mar 14, 2011 · 1bf7da1 · 1bf7da1
1 parent d58a72e
commit 1bf7da1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+* bug fix
+  * Properly ignore path prefix on omniauthable
+
 == 1.2.rc2
 
 * enhancements

diff --git a/lib/devise/rails/routes.rb b/lib/devise/rails/routes.rb
@@ -263,6 +263,7 @@ def devise_registration(mapping, controllers) #:nodoc:
       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 @@ def devise_omniauth_callback(mapping, controllers) #:nodoc:
           ::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: