From e64f89c470231ee971fc68f2b74a076d41ea2a9d Mon Sep 17 00:00:00 2001
From: Mark Ryall <mark@ryall.name>
Date: Tue, 20 Nov 2012 00:40:16 +1100
Subject: [PATCH] moved google oauth stuff into a mixin and removed unnecesary
 serialisation to the session

---
 app/controllers/home_controller.rb            | 21 +++-----------
 lib/google_oauth.rb                           | 29 +++++++++++++++++++
 ...pi_client_spec.rb => google_oauth_spec.rb} | 10 ++++---
 3 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 lib/google_oauth.rb
 rename spec/lib/{google_api_client_spec.rb => google_oauth_spec.rb} (86%)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index c47940f..80c8c8a 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,9 +1,11 @@
 require 'persona'
+require 'google_oauth'
 require 'net/http'
 require 'google_api_ext'
 
 class HomeController < ApplicationController
   include Persona
+  include GoogleOauth
 
   skip_filter :require_login, only: [:index, :verify, :verify_g, :verify_g_callback]
 
@@ -30,26 +32,11 @@ class HomeController < ApplicationController
   end
 
   def verify_g
-    @client = Google::APIClient.build
-    url = @client.authorization.authorization_uri.to_s
-    session[:google_auth] = @client.to_yaml
-
-    redirect_to url
+    redirect_to google_oauth_url
   end
 
   def verify_g_callback
-    google_auth = YAML.load(session[:google_auth])
-    google_auth.authorization.code = params[:code] if params[:code]
-
-    google_auth.authorization.fetch_access_token!
-
-    http = Net::HTTP.new 'www.googleapis.com', 443
-    http.use_ssl = true
-    response = http.get "/oauth2/v1/userinfo?access_token=#{google_auth.authorization.access_token}"
-
-    response = JSON.parse response.body
-    session[:email] = response['email']
+    verify_google_oauth { |email| session[:email] = email }
     redirect_to '/'
   end
-
 end
\ No newline at end of file
diff --git a/lib/google_oauth.rb b/lib/google_oauth.rb
new file mode 100644
index 0000000..ee15a70
--- /dev/null
+++ b/lib/google_oauth.rb
@@ -0,0 +1,29 @@
+require 'google/api_client'
+
+module GoogleOauth
+  def google_oauth_url
+    google_client.authorization.authorization_uri.to_s
+  end
+
+  def verify_google_oauth
+    client = Google::APIClient.build
+    client.authorization.code = params[:code] if params[:code]
+    client.authorization.fetch_access_token!
+
+    http = Net::HTTP.new 'www.googleapis.com', 443
+    http.use_ssl = true
+    response = http.get "/oauth2/v1/userinfo?access_token=#{client.authorization.access_token}"
+
+    response = JSON.parse response.body
+    yield response['email']
+  end
+
+  def google_client
+    Google::APIClient.new.tap do |client|
+      client.authorization.scope = 'https://www.googleapis.com/auth/userinfo.email'
+      client.authorization.client_id = ::ENV['GOOGLE_OAUTH_CLIENT_ID']
+      client.authorization.client_secret = ::ENV['GOOGLE_OAUTH_CLIENT_SECRET']
+      client.authorization.redirect_uri = ::ENV['GOOGLE_OAUTH_REDIRECT']
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/lib/google_api_client_spec.rb b/spec/lib/google_oauth_spec.rb
similarity index 86%
rename from spec/lib/google_api_client_spec.rb
rename to spec/lib/google_oauth_spec.rb
index 2e5499a..ddc5359 100644
--- a/spec/lib/google_api_client_spec.rb
+++ b/spec/lib/google_oauth_spec.rb
@@ -1,7 +1,9 @@
-require 'spec_helper'
+require 'google_oauth'
 
-describe Google::APIClient do
-  describe :build do
+describe GoogleOauth do
+  include GoogleOauth
+
+  describe '#google_client' do
     let(:authorization) { stub 'authorization' }
     let(:client) { stub 'client', authorization: authorization }
     before { Google::APIClient.should_receive(:new).and_return client }
@@ -17,7 +19,7 @@ describe Google::APIClient do
         authorization.should_receive("#{m}=").with value
       end
       authorization.should_receive("scope=").with 'https://www.googleapis.com/auth/userinfo.email'
-      Google::APIClient.build
+      google_client
     end
   end
 end
\ No newline at end of file