GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-07-10 06:48:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor OmniAuth configuration and fix it with 37Signals.

Browse source
This commit is contained in:
Akinori MUSHA 2014-09-24 10:18:04 +09:00
parent 67fa336fb9
commit 9defc7afb8
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/services/index.html.erb
View file

@ -14,7 +14,7 @@
<% if has_oauth_configuration_for?('twitter') %> <% if has_oauth_configuration_for?('twitter') %>
<p><%= link_to "Authenticate with Twitter", "/auth/twitter" %></p> <p><%= link_to "Authenticate with Twitter", "/auth/twitter" %></p>
<% end %> <% end %>
<% if has_oauth_configuration_for?('thirty_seven_signals') %> <% if has_oauth_configuration_for?('37signals') %>
<p><%= link_to "Authenticate with 37Signals (Basecamp)", "/auth/37signals" %></p> <p><%= link_to "Authenticate with 37Signals (Basecamp)", "/auth/37signals" %></p>
<% end -%> <% end -%>
<% if has_oauth_configuration_for?('github') %> <% if has_oauth_configuration_for?('github') %>

44
config/initializers/omniauth.rb
View file

@ -1,23 +1,35 @@
LOADED_OMNIAUTH_STRATEGIES = { OMNIAUTH_PROVIDERS = {}.tap { |providers|
'twitter' => defined?(OmniAuth::Strategies::Twitter), if defined?(OmniAuth::Strategies::Twitter) &&
'37signals' => defined?(OmniAuth::Strategies::ThirtySevenSignals), (key = ENV["TWITTER_OAUTH_KEY"]).present? &&
'github' => defined?(OmniAuth::Strategies::GitHub) (secret = ENV["TWITTER_OAUTH_SECRET"]).present?
providers['twitter'] = {
omniauth_params: [key, secret, authorize_params: {force_login: 'true', use_authorize: 'true'}]
}
end
if defined?(OmniAuth::Strategies::ThirtySevenSignals) &&
(key = ENV["THIRTY_SEVEN_SIGNALS_OAUTH_KEY"]).present? &&
(secret = ENV["THIRTY_SEVEN_SIGNALS_OAUTH_SECRET"]).present?
providers['37signals'] = {
omniauth_params: [key, secret]
}
end
if defined?(OmniAuth::Strategies::GitHub) &&
(key = ENV["GITHUB_OAUTH_KEY"]).present? &&
(secret = ENV["GITHUB_OAUTH_SECRET"]).present?
providers['github'] = {
omniauth_params: [key, secret]
}
end
} }
def has_oauth_configuration_for?(provider) def has_oauth_configuration_for?(provider)
LOADED_OMNIAUTH_STRATEGIES[provider.to_s] && ENV["#{provider.upcase}_OAUTH_KEY"].present? && ENV["#{provider.upcase}_OAUTH_SECRET"].present? OMNIAUTH_PROVIDERS.key?(provider.to_s)
end end
Rails.application.config.middleware.use OmniAuth::Builder do Rails.application.config.middleware.use OmniAuth::Builder do
if has_oauth_configuration_for?('twitter') OMNIAUTH_PROVIDERS.each { |name, config|
provider 'twitter', ENV['TWITTER_OAUTH_KEY'], ENV['TWITTER_OAUTH_SECRET'], authorize_params: {force_login: 'true', use_authorize: 'true'} provider name, *config[:omniauth_params]
end }
if has_oauth_configuration_for?('37signals')
provider '37signals', ENV['THIRTY_SEVEN_SIGNALS_OAUTH_KEY'], ENV['THIRTY_SEVEN_SIGNALS_OAUTH_SECRET']
end
if has_oauth_configuration_for?('github')
provider 'github', ENV['GITHUB_OAUTH_KEY'], ENV['GITHUB_OAUTH_SECRET']
end
end end