omniauth-google-oauth2 0.0.10 → 0.1.0

data/examples/config.ru

@@ -1,4 +1,4 @@
-# Sample app for Google OAuth2 Strateg
+# Sample app for Google OAuth2 Strategy
 # Run with "bundle exec rackup"
 
 require 'rubygems'
@@ -17,13 +17,13 @@ class App < Sinatra::Base
   end
 
   get '/auth/:provider/callback' do
-    content_type 'application/json'
-    MultiJson.encode(request.env)
+    content_type 'text/plain'
+    request.env['omniauth.auth'].to_hash.inspect
   end
   
   get '/auth/failure' do
-    content_type 'application/json'
-    MultiJson.encode(request.env)
+    content_type 'text/plain'
+    request.env['omniauth.auth'].to_hash.inspect
   end
 end
 

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.0.10"
+    VERSION = "0.1.0"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -3,18 +3,29 @@ require 'omniauth/strategies/oauth2'
 module OmniAuth
   module Strategies
     class GoogleOauth2 < OmniAuth::Strategies::OAuth2
+      option :name, 'google_oauth2'
+
       option :client_options, {
         :site => 'https://accounts.google.com',
-        :authorize_path => '/o/oauth2/auth',
-        :token_path => '/o/oauth2/token'
+        :authorize_url => '/o/oauth2/auth',
+        :token_url => '/o/oauth2/token'
       }
 
       def request_phase
+        redirect client.auth_code.authorize_url(authorize_options)
+      end
+
+      def authorize_options
+        opts = {
+          :client_id => options[:client_id],
+          :redirect_uri => callback_url,
+          :response_type => "code",
+          :scope => options[:scope]
+        }
         google_email_scope = "www.googleapis.com/auth/userinfo.email"
-        options[:scope] ||= "https://#{google_email_scope}"
-        options[:scope] << " https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
-        redirect client.auth_code.authorize_url(
-          {:redirect_uri => callback_url, :response_type => "code"}.merge(options))
+        opts[:scope] ||= "https://#{google_email_scope}"
+        opts[:scope] << " https://#{google_email_scope}" unless opts[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
+        opts
       end
 
       def auth_hash
@@ -27,10 +38,16 @@ module OmniAuth
       end
 
       info do
+        if user_data['data']['isVerified']
+          email = user_data['data']['email'] rescue nil
+        else
+          email = nil
+        end
+
         {
-          'email' => "TESTING EMAIL",
-          'uid' => "TESTING UID",
-          'name' => "TESTING NAME"
+          'email' => email,
+          'uid' => email,
+          'name' => email
         }
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 10
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Josh Ellithorpe