google-api-client 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.1
+
+* Fix impersonation with service accounts
+
 # 0.6
 
 * Apps strongly encouraged to set :application_name & :application_version when

data/lib/google/api_client/auth/jwt_asserter.rb

@@ -112,7 +112,7 @@ module Google
       #
       # @see Signet::OAuth2::Client.fetch_access_token!
       def authorize(person = nil, options={})
-        authorization = self.to_authorization
+        authorization = self.to_authorization(person)
         authorization.fetch_access_token!(options)
         return authorization
       end

data/lib/google/api_client/version.rb

@@ -22,7 +22,7 @@ if !defined?(::Google::APIClient::VERSION)
       module VERSION
         MAJOR = 0
         MINOR = 6
-        TINY  = 0
+        TINY  = 1
         STRING = [MAJOR, MINOR, TINY].join('.')
       end
     end

data/spec/google/api_client/discovery_spec.rb

@@ -471,7 +471,6 @@ describe Google::APIClient do
     end
   end
   
-=begin
   describe 'with the latitude API' do
     before do
       CLIENT.authorization = nil
@@ -510,7 +509,7 @@ describe Google::APIClient do
 
     it 'should generate requests against the correct URIs' do
       request = CLIENT.generate_request(
-        :api_method => 'latitude.currentLocation.get',
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
       request.to_env(Faraday.default_connection)[:url].to_s.should ===
@@ -528,74 +527,12 @@ describe Google::APIClient do
 
     it 'should not be able to execute requests without authorization' do
       result = CLIENT.execute(
-        :api_method => 'latitude.currentLocation.get',
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
       result.response.status.should == 401
     end
   end
-=end
-
-  describe 'with the moderator API' do
-    before do
-      CLIENT.authorization = nil
-      @moderator = CLIENT.discovered_api('moderator')
-    end
-
-    it 'should correctly determine the discovery URI' do
-      CLIENT.discovery_uri('moderator').should ===
-        'https://www.googleapis.com/discovery/v1/apis/moderator/v1/rest'
-    end
-
-    it 'should find APIs that are in the discovery document' do
-      CLIENT.discovered_api('moderator').name.should == 'moderator'
-      CLIENT.discovered_api('moderator').version.should == 'v1'
-    end
-
-    it 'should find methods that are in the discovery document' do
-      CLIENT.discovered_method(
-        'moderator.profiles.get', 'moderator'
-      ).name.should == 'get'
-    end
-
-    it 'should define the origin API in discovered methods' do
-      CLIENT.discovered_method(
-        'moderator.profiles.get', 'moderator'
-      ).api.name.should == 'moderator'
-    end
-
-    it 'should not find methods that are not in the discovery document' do
-      CLIENT.discovered_method('moderator.bogus', 'moderator').should == nil
-    end
-
-    it 'should return a batch path' do
-      CLIENT.discovered_api('moderator').batch_path.should_not be_nil
-    end
-
-    it 'should generate requests against the correct URIs' do
-      conn = stub_connection do |stub|
-        stub.get('/moderator/v1/profiles/@me') do |env|
-        end
-      end
-      request = CLIENT.execute(
-        :api_method => @moderator.profiles.get,
-        :authenticated => false,
-        :connection => conn
-      )
-      conn.verify
-    end
-
-    it 'should not be able to execute requests without authorization' do
-      result = CLIENT.execute(
-        @moderator.profiles.get,
-        {},
-        '',
-        [],
-        {:authenticated => false}
-      )
-      result.response.status.should == 401
-    end
-  end
 
   describe 'with the adsense API' do
     before do

data/spec/google/api_client/service_account_spec.rb

@@ -66,6 +66,26 @@ describe Google::APIClient::JWTAsserter do
     claim["scope"].should == 'scope1 scope2'
   end
 
+  it 'should allow impersonation' do
+    conn = stub_connection do |stub|
+      stub.post('/o/oauth2/token') do |env|
+        params = Addressable::URI.form_unencode(env[:body])
+        JWT.decode(params.assoc("assertion").last, @key.public_key)
+        params.assoc("grant_type").should == ['grant_type','urn:ietf:params:oauth:grant-type:jwt-bearer']
+        [200, {}, '{
+          "access_token" : "1/abcdef1234567890",
+          "token_type" : "Bearer",
+          "expires_in" : 3600
+        }']
+      end
+    end
+    asserter = Google::APIClient::JWTAsserter.new('client1', 'scope1 scope2', @key)
+    auth = asserter.authorize('user1@email.com', { :connection => conn })
+    auth.should_not == nil?
+    auth.person.should == 'user1@email.com'
+    conn.verify
+  end
+
   it 'should send valid access token request' do
     conn = stub_connection do |stub|
       stub.post('/o/oauth2/token') do |env|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000Z
+date: 2013-01-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
-  requirement: &70149072361020 !ruby/object:Gem::Requirement
+  requirement: &70316156653060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70149072361020
+  version_requirements: *70316156653060
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70149072360300 !ruby/object:Gem::Requirement
+  requirement: &70316156652460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70149072360300
+  version_requirements: *70316156652460
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70149072359760 !ruby/object:Gem::Requirement
+  requirement: &70316156651920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149072359760
+  version_requirements: *70316156651920
 - !ruby/object:Gem::Dependency
   name: autoparse
-  requirement: &70149072359200 !ruby/object:Gem::Requirement
+  requirement: &70316156651260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70149072359200
+  version_requirements: *70316156651260
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70149072358480 !ruby/object:Gem::Requirement
+  requirement: &70316156650560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70149072358480
+  version_requirements: *70316156650560
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70149072357900 !ruby/object:Gem::Requirement
+  requirement: &70316156650060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149072357900
+  version_requirements: *70316156650060
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &70149072357260 !ruby/object:Gem::Requirement
+  requirement: &70316156649400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *70149072357260
+  version_requirements: *70316156649400
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70149072356600 !ruby/object:Gem::Requirement
+  requirement: &70316156648780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70149072356600
+  version_requirements: *70316156648780
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70149072356100 !ruby/object:Gem::Requirement
+  requirement: &70316156648260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70149072356100
+  version_requirements: *70316156648260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70149072355480 !ruby/object:Gem::Requirement
+  requirement: &70316156647620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70149072355480
+  version_requirements: *70316156647620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149072354900 !ruby/object:Gem::Requirement
+  requirement: &70316156647100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70149072354900
+  version_requirements: *70316156647100
 description: ! 'The Google API Ruby Client makes it trivial to discover and access
   supported