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

feat: allow different client credentials for omniauth google #1104

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

feat: allow different client credentials for omniauth google #1104

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
18 changes: 17 additions & 1 deletion config/initializers/omniauth.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,23 @@
OmniAuth.config.logger = Rails.logger

Rails.application.config.middleware.use OmniAuth::Builder do
provider :google_oauth2, ENV['GOOGLE_CONSUMER_KEY'], ENV['GOOGLE_CONSUMER_SECRET'], verify_iss: false
provider :google_oauth2, {
verify_iss: false,
setup: proc do |env|
host = env['SERVER_NAME']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be a good idea to move the whole subdomain scrabble into some kind of helper since it's necessary for github tokens as well.

it might be worth pulling stuff into the Usergroup class and move initialization to a middleware so you dont have to do the subdomain handling twice (see WhitelabelDetection).

Copy link
Collaborator Author

@salzig salzig Jan 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extraction of whitelabel detection is done in #1108. This needs to be refactored so it uses the current Whitelabel to decide.

tld = host[/(.+\.)?(.+\..+)/, 2]
token = tld.delete('-').split('.').join('_').upcase
name = "OMNIAUTH_GOOGLE_#{token}"

if env.has_key?("#{name}_KEY") && env.has_key?("#{name}_SECRET")
env['omniauth.strategy'].options[:client_id] = ENV["#{name}_KEY"]
env['omniauth.strategy'].options[:client_secret] = ENV["#{name}_SECRET"]
else
env['omniauth.strategy'].options[:client_id] = ENV['GOOGLE_CONSUMER_KEY']
env['omniauth.strategy'].options[:client_secret] = ENV['GOOGLE_CONSUMER_SECRET']
end
end
}
provider :twitter, ENV['TWITTER_CONSUMER_KEY'], ENV['TWITTER_CONSUMER_SECRET']
provider :github, {
setup: proc do |env|
Expand Down
Loading