issue 124

Gemfile

@@ -62,6 +62,7 @@ gem 'omniauth'
 gem 'omniauth-facebook'
 gem 'dotenv-rails'
 gem 'omniauth-twitter'
+gem 'omniauth-google-oauth2'
 gem 'geocoder'
 gem 'carrierwave'
 gem 'rmagick'

Gemfile.lock

@@ -126,6 +126,11 @@ GEM
       rack (>= 1.0, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.5.2)
+      jwt (~> 1.5)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -242,6 +247,7 @@ DEPENDENCIES
   masonry-rails
   omniauth
   omniauth-facebook
+  omniauth-google-oauth2
   omniauth-twitter
   puma (~> 3.0)
   rails (~> 5.0.1)

app/controllers/users/omniauth_callbacks_controller.rb

@@ -7,6 +7,10 @@ def twitter
     callback_from :twitter
   end
 
+  def google_oauth2
+    callback_from :google
+  end
+
   private
 
   def callback_from(provider)
@@ -18,7 +22,7 @@ def callback_from(provider)
       sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
       set_flash_message(:notice, :success, :kind => provider.capitalize) if is_navigational_format?
     else
-      session["devise.#{provider}_data"] = request.env["omniauth.auth"]
+      session["devise.#{provider}_data"] = request.env["omniauth.auth"].except("extra")
       redirect_to new_user_registration_url
     end
   end

app/models/user.rb

@@ -2,7 +2,7 @@ class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :omniauth_providers => [:facebook, :twitter]
+         :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :omniauth_providers => [:facebook, :twitter, :google_oauth2]
   has_many :posts
   has_many :comments
   before_save { self.email = email.downcase }
@@ -16,6 +16,7 @@ def self.find_for_oauth(auth)
     unless user
       nickname = auth.extra.raw_info.name if auth.provider == 'facebook'
       nickname = auth.info.nickname if auth.provider == 'twitter'
+      nickname = auth.info.name if auth.provider == 'google_oauth2'
 
       user = User.create(
         uid:      auth.uid,

app/views/home/_show_post.html.erb

@@ -1,4 +1,4 @@
 <%= div_for(show_post, class: "box") do %>
   <%= show_post.name %>
-  <%= link_to image_tag(show_post.pics[0].avatar_url), url_for(controller: :posts, action: :show, id: show_post.id) %>
+  <%#= link_to image_tag(show_post.pics[0].avatar_url), url_for(controller: :posts, action: :show, id: show_post.id) %>
 <% end %>

app/views/home/signin.html.erb

@@ -5,8 +5,10 @@
 <% if user_signed_in? %>
   <% if current_user.provider == "facebook" %>
     <i class="facebook icon"></i>
-  <% else current_user.provider == "twitter" %>
+  <% elsif current_user.provider == "twitter" %>
     <i class="twitter icon"></i>
+  <% elsif current_user.provider == "google_oauth2" %>
+    <i class="google plus icon"></i>
   <% end %>
   <%= link_to current_user.nickname, current_user %>
 <% else %>
@@ -19,6 +21,10 @@
   <div id="tw-login-button">
     <%= link_to '<i class="twitter icon"></i> Twitter'.html_safe, user_twitter_omniauth_authorize_path,   :class => "ui twitter button" %>
   </div>
+
+  <div id="google-login-button">
+    <%= link_to '<i class="google plus icon"></i> Google'.html_safe, user_google_oauth2_omniauth_authorize_path,   :class => "ui google plus button" %>
+  </div>
 <% end %>
 </div>
 

app/views/layouts/_bottom_menu.html.erb

@@ -6,8 +6,10 @@
     <div class="item">
       <% if current_user.provider == "facebook" %>
         <i class="facebook icon"></i>
-      <% else current_user.provider == "twitter" %>
+      <% elsif current_user.provider == "twitter" %>
         <i class="twitter icon"></i>
+      <% elsif current_user.provider == "google_oauth2" %>
+        <i class="google plus icon"></i>
       <% end %>
       <%= link_to current_user.nickname, current_user %>
       [<%= link_to 'Sign out', destroy_user_session_path, method: :delete  %>]

config/initializers/devise.rb

@@ -271,6 +271,7 @@
   # When using OmniAuth, Devise cannot automatically set OmniAuth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
-  config.omniauth :facebook, ENV['FACEBOOK_API'], ENV['FACEBOOK_KEY']
-  config.omniauth :twitter,  ENV['TWITTER_API'],  ENV['TWITTER_KEY']
+  config.omniauth :facebook,       ENV['FACEBOOK_API'],       ENV['FACEBOOK_KEY']
+  config.omniauth :twitter,        ENV['TWITTER_API'],        ENV['TWITTER_KEY']
+  config.omniauth :google_oauth2,  ENV['GOOGLE_CLIENT_ID'],   ENV['GOOGLE_CLIENT_SECRET']
 end