google-ads-common 0.12.6 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4310819d97635131655a65b5d98849c18ec76cb
-  data.tar.gz: 63c393bcacd43a3c34763f12c8ec939499dac628
+  metadata.gz: 2f9fd925b1012604aaedfaba55ac60cd16fed3f3
+  data.tar.gz: 4a27eb4e56b52c99148be41fdcfc98946a9fd947
 SHA512:
-  metadata.gz: dfc0517f0ad20ba3a4a2e39a7cb11ad711364c67def32b6833adbc873fbad27e994cd96c1b99005589c53cec604c4d28671e540a398a894c387a266c382c2800
-  data.tar.gz: 3ac22c22c57f716fa0e5dd822668d24e5c42c03f3cd6e5030650f88d701f2fea3a326f8adf4afd447dded0655c5ccd0280cba4f078b0296c95d76d7241b565b2
+  metadata.gz: 1664c58b1bae120d33c4d890d4978c0702cd9caa65dffa39d146a985a42985df7bef92b93447d0c25f9a7158991f5371dce495943f2bc5f61bae5276081bb979
+  data.tar.gz: 71d90e5d480d8f17457261c13f8e61e2e573a72e27d42b1101fa8ba518fbcc920c75fa4fbed9fd3b285845305666e802f8721d6b9889a84de9def2a6e18b3b4d

data/ChangeLog

@@ -1,3 +1,8 @@
+0.13.0:
+  - Removed support for p12 keyfiles for service accounts.
+  - Fixed issue #27. You can now force a refresh when fetching the access token
+    using the get_token function.
+
 0.12.6:
   - Added support for config param :oauth2_prompt and removed support for
     :oauth2_approval_prompt, and updated URI parameter name. The expected value

data/lib/ads_common/auth/oauth2_handler.rb

@@ -82,9 +82,10 @@ module AdsCommon
       end
 
       # Overrides base get_token method to account for the token expiration.
-      def get_token(credentials = nil)
+      def get_token(credentials = nil, force_refresh = false)
         token = super(credentials)
-        token = refresh_token! if !@client.nil? && @client.expired?
+        token = refresh_token! if !@client.nil? &&
+            (force_refresh || @client.expired?)
         return token
       end
 

data/lib/ads_common/auth/oauth2_service_account_handler.rb

@@ -124,30 +124,20 @@ module AdsCommon
               'key file provided, only one can be used.'
         end
 
-        p12 = true
         if credentials[:oauth2_keyfile]
           file_name = credentials[:oauth2_keyfile]
           if File.file?(file_name)
-            unless file_name.end_with?('.p12') || file_name.end_with?('.json')
+            unless file_name.end_with?('.json')
               raise AdsCommon::Errors::AuthError,
-                  "Key file '%s' must be either a .p12 or .json file." %
-                  file_name
+                  "Key file '%s' must be a .json file." % file_name
             end
-            p12 = false if file_name.end_with?('.json')
           else
             raise AdsCommon::Errors::AuthError,
                 "Key file '%s' does not exist or not a file." % file_name
           end
-        end
-
-        if credentials[:oauth2_issuer].nil? && p12
-          raise AdsCommon::Errors::AuthError,
-              'Issuer is not included in the credentials.'
-        end
-
-        if credentials[:oauth2_secret].nil? && p12
+        elsif credentials[:oauth2_issuer].nil?
           raise AdsCommon::Errors::AuthError,
-              'Key secret is not included in the credentials.'
+              'Issuer must be specified in the config if not using a key file.'
         end
 
         if credentials[:oauth2_key] &&
@@ -195,16 +185,9 @@ module AdsCommon
       def load_oauth2_service_account_credentials(credentials)
         return credentials unless credentials.include?(:oauth2_keyfile)
         key_file = File.read(credentials[:oauth2_keyfile])
-        key = nil
-        issuer = nil
-        if credentials[:oauth2_keyfile].end_with?('.p12')
-          key_secret = credentials[:oauth2_secret]
-          key = OpenSSL::PKCS12.new(key_file, key_secret).key
-        else
-          key_file_hash = JSON.parse(key_file, :symbolize_names => true)
-          key = OpenSSL::PKey::RSA.new(key_file_hash[:private_key])
-          issuer = key_file_hash[:client_email]
-        end
+        key_file_hash = JSON.parse(key_file, :symbolize_names => true)
+        key = OpenSSL::PKey::RSA.new(key_file_hash[:private_key])
+        issuer = key_file_hash[:client_email]
         result = credentials.merge({:oauth2_key => key})
         result[:oauth2_issuer] = issuer unless issuer.nil?
         result.delete(:oauth2_keyfile)

data/lib/ads_common/build/savon_abstract_generator.rb

@@ -15,7 +15,7 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# Code template generator base class
+# Code template generator base class.
 
 require 'ads_savon'
 require 'erb'
@@ -53,6 +53,7 @@ module AdsCommon
         @modules_open_string = 'module ' +
             [@api_name, @version.to_s.upcase, @service_name].join('; module ')
         @modules_close_string = 'end; end; end'
+        @year = Time.now.year
       end
 
       def remove_lines_with_blanks_only(text)

data/lib/ads_common/build/savon_registry_generator.rb

@@ -15,11 +15,12 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# Code template for registry generation for Savon backend
+# Code template for registry generation for Savon backend.
+
+require 'pp'
 
 require 'ads_savon'
 require 'ads_common/build/savon_abstract_generator'
-require 'pp'
 
 module AdsCommon
   module Build
@@ -29,7 +30,7 @@ module AdsCommon
       #
       # This is auto-generated code, changes will be overwritten.
       #
-      # Copyright:: Copyright 2016, Google Inc. All Rights Reserved.
+      # Copyright:: Copyright <%= @year %>, Google Inc. All Rights Reserved.
       # License:: Licensed under the Apache License, Version 2.0.
       #
       # <%= @generator_stamp %>

data/lib/ads_common/build/savon_service_generator.rb

@@ -15,7 +15,7 @@
 #           See the License for the specific language governing permissions and
 #           limitations under the License.
 #
-# Code template for wrappers generation for Savon backend
+# Code template for wrappers generation for Savon backend.
 
 require 'ads_savon'
 require 'ads_common/build/savon_abstract_generator'
@@ -29,7 +29,7 @@ module AdsCommon
       #
       # This is auto-generated code, changes will be overwritten.
       #
-      # Copyright:: Copyright 2016, Google Inc. All Rights Reserved.
+      # Copyright:: Copyright <%= @year %>, Google Inc. All Rights Reserved.
       # License:: Licensed under the Apache License, Version 2.0.
       #
       # <%= @generator_stamp %>

data/lib/ads_common/version.rb

@@ -19,6 +19,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.12.6'
+    CLIENT_LIB_VERSION = '0.13.0'
   end
 end

data/test/test_oauth2_service_account_handler.rb

@@ -36,7 +36,7 @@ class TestOAuthServiceAccount < Test::Unit::TestCase
     assert_nothing_raised do
       validate_credentials(['test', '.json'])
     end
-    assert_nothing_raised do
+    assert_raise(AdsCommon::Errors::AuthError) do
       validate_credentials(['test', '.p12'])
     end
     assert_raises(AdsCommon::Errors::AuthError) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.13.0
 platform: ruby
 authors:
 - Sergio Gomes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-savon