omniauth-google-oauth2 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTE1ZjFkZmYyYTNlM2I4MTI5NmM2MmZlMWFlYjZmNjQ2YjNhNDU1MA==
+    ZmVkNzJkYzQ3MzVkNjNhMWUwZWE4YWQyNzlmZGJlNmJjYjI2ZjQwMw==
   data.tar.gz: !binary |-
-    OTNiNzQ4MGVhMmFkODVhZGU3Yjk0ZTFjNmY1ZDlkNjM5ZTUwMTFkOA==
+    ZjA0Y2Q2Mzc4ZmMyNTFhZTY0NDUxOThmYmY4MTM1MDllMGUwMWE5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGI2YjNkMWU5MzRjNzcyYjIxZTE1NGJhMTFkNWNmZDZmMGU1NjczODAwZjUz
-    Y2U5YWE5ZjU3ZDY4NTc5YTVhMmUyZmNhOTk0M2VjZmY3MTc5YzI4MzRiOWEw
-    MDZmY2YwNTE2YmQ1MGRiNDg5ZTBlNzI3OWU5ZDBkNmQ1NjNjOWM=
+    MTI1Y2EwZTY3Mjk5ZTIzNGE4ZjRhZTc1YjY5NmE0ODJjNTNjYWQ0MzRkZmQ1
+    OWU0ZTVmMTJmNzJjNDMwYWQzM2I3NzVmZGJhMjYyZGM1Y2UwNmI5ODNhZTA0
+    MmIzZWQ5NzJiNTNkNzc3YjE4MTRlNjUxYWRkNGViOWNjYWJhZTM=
   data.tar.gz: !binary |-
-    YTViOTc3NTgwMTJjYjg0NjhhZDJhYzRlM2E4MmMyZjA2NWQ4YWQ1NWRmODAy
-    YjZlYjQ3OTkxYjRjNTAxNWQwMTVkN2E5ZDhlZDI1ZTg4Y2ZkNTBjYmRiYTYx
-    MjU2N2Q5ZGQxNzVjZWViNDQ4YjM3ZjQ1OGZkMGY3YTk5N2RiNDk=
+    ZDk4MDhmZGU5OTAzODI3MzhlODQ5YWRmNTM4YzVhNmQ2ZjQxZDMwMjg1Mjg1
+    NDk1ODFhOWZmOWE4MjJmMjkzMzBhN2U4OTg2OTY2M2Q3MDEyM2U0NTU2NGI0
+    ZDcxZTIzOTRhMTVkZTFiODY1MGMyMTk2OTVhNjhhMmZkZDIwNmE=

data/README.md

@@ -37,7 +37,7 @@ NOTE: While developing your application, if you change the scope in the initiali
 You can configure several options, which you pass in to the `provider` method via a hash:
 
 * `scope`: A comma-separated list of permissions you want to request from the user. See the [Google OAuth 2.0 Playground](https://developers.google.com/oauthplayground/) for a full list of available permissions. Caveats:
-  * The `userinfo.email` and `userinfo.profile` scopes are used by default. By defining your own `scope`, you override these defaults. If you need these scopes, don't forget to add them yourself!
+  * The `email` and `profile` scopes are used by default. By defining your own `scope`, you override these defaults. If you need these scopes, don't forget to add them yourself!
   * Scopes starting with `https://www.googleapis.com/auth/` do not need that prefix specified. So while you can use the smaller scope `books` since that permission starts with the mentioned prefix, you should use the full scope URL `https://docs.google.com/feeds/` to access a user's docs, for example.
 * `prompt`: A space-delimited list of string values that determines whether the user is re-prompted for authentication and/or consent. Possible values are:
   * `none`: No authentication or consent pages will be displayed; it will return an error if the user is not already authenticated and has not pre-configured consent for the requested scopes. This can be used as a method to check for existing authentication and/or consent.
@@ -69,7 +69,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"],
     {
       :name => "google",
-      :scope => "userinfo.email, userinfo.profile, plus.me, http://gdata.youtube.com",
+      :scope => "email, profile, plus.me, http://gdata.youtube.com",
       :prompt => "select_account",
       :image_aspect_ratio => "square",
       :image_size => 50
@@ -100,13 +100,13 @@ Here's an example of an authentication hash available in the callback by accessi
     },
     :extra => {
         :raw_info => {
-            :id => "123456789",
+            :sub => "123456789",
             :email => "user@domain.example.com",
-            :verified_email => true,
+            :email_verified => true,
             :name => "John Doe",
             :given_name => "John",
             :family_name => "Doe",
-            :link => "https://plus.google.com/123456789",
+            :profile => "https://plus.google.com/123456789",
             :picture => "https://lh3.googleusercontent.com/url/photo.jpg",
             :gender => "male",
             :birthday => "0000-06-25",

data/examples/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'
+gem 'omniauth-google-oauth2'

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -95,6 +95,7 @@ module OmniAuth
 
       def image_url
         original_url = raw_info['picture']
+        original_url = original_url.gsub("https:https://", "https://") if original_url
         params_index = original_url.index('/photo.jpg') if original_url
 
         if params_index && image_size_opts_passed?

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -391,8 +391,8 @@ describe OmniAuth::Strategies::GoogleOauth2 do
 
       it 'should return original image if image url does not end in `photo.jpg`' do
         @options = {:image_size => 50}
-        subject.stub(:raw_info) { {'picture' => 'https://lh3.googleusercontent.com/url/photograph.jpg'} }
-        subject.info[:image].should eq('https://lh3.googleusercontent.com/url/photograph.jpg')
+        allow(subject).to receive(:raw_info) { {'picture' => 'https://lh3.googleusercontent.com/url/photograph.jpg'} }
+        expect(subject.info[:image]).to eq('https://lh3.googleusercontent.com/url/photograph.jpg')
       end
     end
 
@@ -400,6 +400,11 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       allow(subject).to receive(:raw_info) { {'picture' => 'https://lh3.googleusercontent.com/url/photo.jpg'} }
       expect(subject.info[:image]).to eq('https://lh3.googleusercontent.com/url/photo.jpg')
     end
+    
+    it 'should return correct image if google image url has double https' do
+      allow(subject).to receive(:raw_info) { {'picture' => 'https:https://lh3.googleusercontent.com/url/photo.jpg'} }
+      expect(subject.info[:image]).to eq('https://lh3.googleusercontent.com/url/photo.jpg')
+    end
   end
 
   describe 'build_access_token' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -79,6 +79,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- examples/Gemfile
 - examples/config.ru
 - examples/omni_auth.rb
 - lib/omniauth-google-oauth2.rb