omniauth-google-oauth2 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0643ee95f8a2b03be985a1a23c4d714bcb260f24
-  data.tar.gz: 9a4aa200d91bde859d5a65acbea094f388028903
+  metadata.gz: 3ede9c8b2ed21745e5e2455baa4bffa9b080a5af
+  data.tar.gz: 5a7c985d8e1940b7cf07ab4dcf8025491ec69e38
 SHA512:
-  metadata.gz: 2938e8c5d8be4d46e0f46bd709417829a249f586d26b1ef63bed5612b0c4fc70d2bbcec9ee70b1249b4f9ea4dd5ca3b06901e2b89478d94daa551bc77c7d20d6
-  data.tar.gz: f7e105d0d91ca5e0aa7404ecf73320204941874bf9532e0d549897b835633cc6f097b4f061174c8f1a8a94a37d8821fc5ce3d6a1a76eaf590e772596d77f5b18
+  metadata.gz: 4d52a2e108594667e40b2334d7d5fdf3624ca2390cb7099b663747586765dc0ee0ba7527578fd4db43e2b16d82a703701be07346eef148c32e2e2e7fdfa45bb8
+  data.tar.gz: 06ec6644022308248167bceea0ff590b6964b24dd548497610ac28a6bd5cad64b38948caa8ca21ca4cf5a94566bfb6b9f595c5311375461ecd8d005c4eb33c7f

data/.travis.yml

@@ -2,7 +2,6 @@ before_install:
   - gem update --system 2.1.11
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.2.10 - 2015-11-05
+
+### Added
+- Nothing.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Removed some checks on the id_token. Now only parses the id_token in the JWT processing.
+
+### Fixed
+- Nothing.
+
 ## 0.2.9 - 2015-10-29
 
 ### Added

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.2.9"
+    VERSION = "0.2.10"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -97,7 +97,7 @@ module OmniAuth
           verifier = request.params['code']
           redirect_uri = request.params['redirect_uri']
           client.auth_code.get_token(verifier, get_token_options(redirect_uri), deep_symbolize(options.auth_token_params || {}))
-        elsif verify_token(request.params['id_token'], request.params['access_token'])
+        elsif verify_token(request.params['access_token'])
           ::OAuth2::AccessToken.from_hash(client, request.params.dup)
         else
           orig_build_access_token
@@ -169,13 +169,10 @@ module OmniAuth
         query_hash
       end
 
-      def verify_token(id_token, access_token)
-        return false unless (id_token && access_token)
-
-        raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v2/tokeninfo', :params => {
-          :id_token => id_token,
-          :access_token => access_token
-        }).parsed
+      def verify_token(access_token)
+        return false unless access_token
+        raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v2/tokeninfo',
+                                      params: { access_token: access_token }).parsed
         raw_response['issued_to'] == options.client_id
       end
     end

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -521,8 +521,8 @@ describe OmniAuth::Strategies::GoogleOauth2 do
 
     it 'should read access_token from hash if this is not an AJAX request with a code parameter' do
       allow(request).to receive(:xhr?).and_return(false)
-      allow(request).to receive(:params).and_return('id_token' => 'valid_id_token', 'access_token' => 'valid_access_token')
-      expect(subject).to receive(:verify_token).with('valid_id_token', 'valid_access_token').and_return true
+      allow(request).to receive(:params).and_return('access_token' => 'valid_access_token')
+      expect(subject).to receive(:verify_token).with('valid_access_token').and_return true
       expect(subject).to receive(:client).and_return(:client)
 
       token = subject.build_access_token
@@ -544,7 +544,7 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       subject.options.client_options[:connection_build] = proc do |builder|
         builder.request :url_encoded
         builder.adapter :test do |stub|
-          stub.get('/oauth2/v2/tokeninfo?id_token=valid_id_token&access_token=valid_access_token') do |env|
+          stub.get('/oauth2/v2/tokeninfo?access_token=valid_access_token') do |env|
             [200, {'Content-Type' => 'application/json; charset=UTF-8'}, MultiJson.encode(
               :issued_to => '000000000000.apps.googleusercontent.com',
               :audience => '000000000000.apps.googleusercontent.com',
@@ -556,25 +556,25 @@ describe OmniAuth::Strategies::GoogleOauth2 do
               :access_type => 'online'
             )]
           end
-          stub.get('/oauth2/v2/tokeninfo?id_token=invalid_id_token&access_token=invalid_access_token') do |env|
+          stub.get('/oauth2/v2/tokeninfo?access_token=invalid_access_token') do |env|
             [400, {'Content-Type' => 'application/json; charset=UTF-8'}, MultiJson.encode(:error_description => 'Invalid Value')]
           end
         end
       end
     end
 
-    it 'should verify token if access_token and id_token are valid and app_id equals' do
+    it 'should verify token if access_token is valid and app_id equals' do
       subject.options.client_id = '000000000000.apps.googleusercontent.com'
-      expect(subject.send(:verify_token, 'valid_id_token', 'valid_access_token')).to eq(true)
+      expect(subject.send(:verify_token, 'valid_access_token')).to eq(true)
     end
 
-    it 'should not verify token if access_token and id_token are valid but app_id is false' do
-      expect(subject.send(:verify_token, 'valid_id_token', 'valid_access_token')).to eq(false)
+    it 'should not verify token if access_token is valid but app_id is false' do
+      expect(subject.send(:verify_token, 'valid_access_token')).to eq(false)
     end
 
-    it 'should raise error if access_token or id_token is invalid' do
+    it 'should raise error if access_token is invalid' do
       expect {
-        subject.send(:verify_token, 'invalid_id_token', 'invalid_access_token')
+        subject.send(:verify_token, 'invalid_access_token')
       }.to raise_error(OAuth2::Error)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth