Skip to content

add support for multiple omniauthable models #1

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

Open
Notalifeform wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for multiple omniauthable models #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions lib/devise/rails/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,9 @@ def devise_omniauth_callback(mapping, controllers) #:nodoc:
end
path_prefix = Devise.omniauth_path_prefix || "/#{mapping.fullpath}/auth".squeeze("/")

set_omniauth_path_prefix!(path_prefix)
unless mapping.to.omniauth_providers.all? { |provider| Devise.omniauth_configs[provider].options[:path_prefix].present? }
set_omniauth_path_prefix!(path_prefix)
end

mapping.to.omniauth_providers.each do |provider|
match "#{path_prefix}/#{provider}",
Expand Down Expand Up @@ -489,7 +491,8 @@ def set_omniauth_path_prefix!(path_prefix) #:nodoc:
if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
raise "Wrong OmniAuth configuration. If you are getting this exception, it means that either:\n\n" \
"1) You are manually setting OmniAuth.config.path_prefix and it doesn't match the Devise one\n" \
"2) You are setting :omniauthable in more than one model\n" \
"2) You are setting :omniauthable in more than one model, but you did not specify custom path_prefix " \
"when you registered provider for this model in config/initializers/devise.rb\n" \
"3) You changed your Devise routes/OmniAuth setting and haven't restarted your server"
else
::OmniAuth.config.path_prefix = path_prefix
Expand Down