From 8907aa1cb64a6e6a462ffb2c5babc71301f55342 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 8 Sep 2013 02:32:53 +0000 Subject: [PATCH] * making google api keys configurable, and setting up developer default configuration --- config/application.rb | 4 ++++ config/initializers/omniauth.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 34127c372..28c019531 100644 --- a/config/application.rb +++ b/config/application.rb @@ -125,6 +125,10 @@ if defined?(Bundler) # facebook keys config.facebook_key = '468555793186398' + # google api keys + config.google_client_id = '785931784279-gd0g8on6sc0tuesj7cu763pitaiv2la8.apps.googleusercontent.com' + config.google_secret = 'UwzIcvtErv9c2-GIsNfIo7bA' + if Rails.env == 'production' config.desk_url = 'https://jamkazam.desk.com' config.multipass_callback_url = "http://jamkazam.desk.com/customer/authentication/multipass/callback" diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 07bb8a8fd..dfd12313e 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,5 +1,5 @@ Rails.application.config.middleware.use OmniAuth::Builder do provider :facebook, '468555793186398', '546a5b253972f3e2e8b36d9a3dd5a06e', {:scope => 'email,user_location'} - provider :google_oauth2, '283735686700.apps.googleusercontent.com', 'ne8WUe2DzRojNeufggDDtc__', {name: "google_login", approval_prompt: '', scope: 'userinfo.email, userinfo.profile, https://www.google.com/m8/feeds'} + provider :google_oauth2, Rails.application.config.google_client_id, Rails.application.config.google_secret, {name: "google_login", approval_prompt: '', scope: 'userinfo.email, userinfo.profile, https://www.google.com/m8/feeds'} end