Fix #12 Google oauth 2

Author: phallguy

Gemfile

@@ -11,7 +11,7 @@ gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'therubyracer', platforms: :ruby
 gem 'jbuilder', '~> 1.2'
-gem 'omniauth-openid'
+gem 'omniauth-google-oauth2', '~> 0.2.5'
 gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'omniauth-stackexchange'

Gemfile.lock

@@ -150,9 +150,9 @@ GEM
     columnize (0.3.6)
     commonjs (0.2.7)
     connection_pool (2.0.0)
-    countries (0.11.2)
+    countries (0.11.4)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     dalli (2.7.4)
     database_cleaner (1.2.0)
@@ -189,11 +189,11 @@ GEM
       spring
     haml (4.0.6)
       tilt
-    hashie (2.1.0)
+    hashie (3.4.2)
     highline (1.6.21)
     hike (1.2.3)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
@@ -253,12 +253,15 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.12.1)
-    omniauth (1.2.1)
-      hashie (>= 1.2, < 3)
+    oj (2.12.9)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
       rack (~> 1.0)
     omniauth-facebook (1.6.0)
       omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.6)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
@@ -267,9 +270,6 @@ GEM
       multi_json (~> 1.3)
       oauth2 (~> 0.9.3)
       omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
     omniauth-stackexchange (0.2.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
@@ -278,11 +278,11 @@ GEM
       omniauth-oauth (~> 1.0)
     optionable (0.2.0)
     origin (2.1.1)
-    phony (2.12.3)
-    phony_rails (0.11.0)
+    phony (2.14.4)
+    phony_rails (0.12.6)
       activesupport (>= 3.0)
       countries (~> 0.8, >= 0.8.2)
-      phony (~> 2.11, >= 2.11.1)
+      phony (~> 2.12)
     poltergeist (1.5.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -293,12 +293,9 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.5.3)
     rack-handlers (0.7.0)
       rack
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.4)
@@ -340,7 +337,6 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    ruby-openid (2.5.0)
     ruby-prof (0.14.2)
     rvm-capistrano (1.5.1)
       capistrano (~> 2.15.4)
@@ -419,7 +415,7 @@ DEPENDENCIES
   nokogiri
   non-stupid-digest-assets
   omniauth-facebook
-  omniauth-openid
+  omniauth-google-oauth2 (~> 0.2.5)
   omniauth-stackexchange
   omniauth-twitter
   poltergeist

config/initializers/omniauth.rb

@@ -1,20 +1,6 @@
-require 'omniauth-openid'
-require 'openid'
-require 'openid/store/filesystem'
-require 'openid/store/memcache'
-require 'dalli'
-
-require 'openid/fetchers'
-OpenID.fetcher.ca_file = File.join(Rails.root,'config','ca-bundle.crt')
-
-memcache_client = Dalli::Client.new
-
-OmniAuth.config.logger = Rails.logger
-
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :open_id, name: "google", identifier: "https://www.google.com/accounts/o8/id", store: OpenID::Store::Memcache.new(memcache_client)
+  provider :google_oauth2 , Settings.google.app_id    , Settings.google.secret    , secure_image_url: true , name: 'google'
   provider :facebook, Settings.facebook.app_id, Settings.facebook.secret, secure_image_url: true, info_fields: "name,email", scope: :email
-  # provider :twitter, Settings.twitter.app_id, Settings.twitter.secret, secure_image_url: true, info_fields: "name,email", scope: :email
   provider :twitter, Settings.twitter.app_id, Settings.twitter.secret, secure_image_url: true, info_fields: "name,email", scope: :email
   provider :stackexchange, Settings.stackexchange.app_id, Settings.stackexchange.secret, site: "stackoverflow", public_key: Settings.stackexchange.key
 end

config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-RefiddleCom::Application.config.session_store ActionDispatch::Session::CacheStore
+RefiddleCom::Application.config.session_store ActionDispatch::Session::CacheStore, domain: :all

config/settings.yml

@@ -6,6 +6,10 @@ twitter:
   app_id: xCz4V3WIFh82sqfhk6nOJWhGg
   secret:
 
+google:
+  app_id: 377269949378-9ebhhumbbq3vatua35h756ika3o4fmae.apps.googleusercontent.com
+  secret:
+
 stackexchange:
   app_id: 2860
   secret: