apimatic_core 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6999e5f75a815faf7120e5f551b3ea2661e6d146a84e087426f64b27863d2fc
-  data.tar.gz: f9c63258f67b4798393569aa35ca04c54bd70b0109f32d2f3bd756b6aed7838d
+  metadata.gz: 3c4d7987cd14dba534fc21ecff7af13a00e80d0dc83c87bcdf3ac88f38e74ae4
+  data.tar.gz: 7c9ad8e1dc5944172bb0fbd8e34d55555f6e9e9292de818000f4d2de9c5ae6b1
 SHA512:
-  metadata.gz: c86684bed17cbe67d0750a78bda0bc03b2385414a8ebba30088fa7990d45ae2471426cb8c0457ead6d3d1dbcbb5a11003e435fc2105917e234b6e13cd2a292b2
-  data.tar.gz: 5c539fe7981f7aa5196ad81e9f0e76ffaa3d3729d536f824ab3b5c2170e5cce61300f3f6018db93785121487b18db580d0eed60c67443ed4c2b72c8445a89899
+  metadata.gz: edbb96486fd7db0982e0d1d43247b839d015c799fc59d6493687d128b5952999f82d5c95752c15dc7aff2829c2f4f5e2a10ae42b882992bb00a5255e41321402
+  data.tar.gz: cc683617c4117e1fdb58ca1da197af7873ad29b985a3ca7e135ef8db3d54d1113908821877d126fd74d4a1be0d9041942e5142a2dcf70d8223447f010aabb2fc

data/lib/apimatic-core/logger/sdk_logger.rb

@@ -13,7 +13,8 @@ module CoreLibrary
       content_type_header = LoggerHelper.get_content_type(request.headers)
       url = @request_logging_config.include_query_in_path ? request.query_url : request.query_url.split('?').first
 
-      @logger.log(@log_level, "Request {#{METHOD}} {#{URL}} {#{CONTENT_TYPE_HEADER}}", {
+      @logger.log(@log_level, "Request {#{METHOD}} {#{URL}} {#{CONTENT_TYPE_HEADER}}",
+                  {
                     METHOD => request.http_method,
                     URL => url,
                     CONTENT_TYPE_HEADER => content_type_header
@@ -26,7 +27,8 @@ module CoreLibrary
       content_type_header = LoggerHelper.get_content_type(response.headers)
       content_length_header = LoggerHelper.get_content_length(response.headers)
 
-      @logger.log(@log_level, "Response {#{STATUS_CODE}} {#{CONTENT_LENGTH_HEADER}} {#{CONTENT_TYPE_HEADER}}", {
+      @logger.log(@log_level, "Response {#{STATUS_CODE}} {#{CONTENT_LENGTH_HEADER}} {#{CONTENT_TYPE_HEADER}}",
+                  {
                     STATUS_CODE => response.status_code,
                     CONTENT_LENGTH_HEADER => content_length_header,
                     CONTENT_TYPE_HEADER => content_type_header
@@ -40,39 +42,37 @@ module CoreLibrary
     def apply_log_request_options(request)
       headers_to_log = LoggerHelper.extract_headers_to_log(
         @request_logging_config,
+        @mask_sensitive_headers,
         request.headers
       )
 
       if @request_logging_config.log_headers
-        @logger.log(@log_level, 'Request headers {headers}', {
-                      headers: headers_to_log
-                    })
+        @logger.log(@log_level, 'Request headers {headers}',
+                    { headers: headers_to_log })
       end
 
       return unless @request_logging_config.log_body
 
-      @logger.log(@log_level, 'Request body {body}', {
-                    body: request.parameters
-                  })
+      @logger.log(@log_level, 'Request body {body}',
+                  { body: request.parameters })
     end
 
     def apply_log_response_options(response)
       headers_to_log = LoggerHelper.extract_headers_to_log(
         @response_logging_config,
+        @mask_sensitive_headers,
         response.headers
       )
 
       if @response_logging_config.log_headers
-        @logger.log(@log_level, 'Response headers {headers}', {
-                      headers: headers_to_log
-                    })
+        @logger.log(@log_level, 'Response headers {headers}',
+                    { headers: headers_to_log })
       end
 
       return unless @response_logging_config.log_body
 
-      @logger.log(@log_level, 'Response body {body}', {
-                    body: response.raw_body
-                  })
+      @logger.log(@log_level, 'Response body {body}',
+                  { body: response.raw_body })
     end
   end
 end

data/lib/apimatic-core/utilities/auth_helper.rb

@@ -16,10 +16,12 @@ module CoreLibrary
 
     # Checks if OAuth token has expired.
     # @param [int] token_expiry The expiring of a token.
+    # @param [int|Optional] clock_skew_time A buffer to the calculated expiry.
     # @return [Boolean] true if token has expired, false otherwise.
-    def self.token_expired?(token_expiry)
+    def self.token_expired?(token_expiry, clock_skew_time = nil)
       raise ArgumentError, 'Token expiry can not be nil.' if token_expiry.nil?
 
+      token_expiry -= clock_skew_time unless clock_skew_time.nil?
       token_expiry < Time.now.utc.to_i
     end
 

data/lib/apimatic-core/utilities/constants.rb

@@ -4,4 +4,5 @@ module CoreLibrary
   METHOD = 'method'.freeze
   URL = 'url'.freeze
   STATUS_CODE = 'status_code'.freeze
+  REDACTED = '**Redacted**'.freeze
 end

data/lib/apimatic-core/utilities/logger_helper.rb

@@ -23,7 +23,7 @@ module CoreLibrary
       headers.find { |key, _| key.downcase == CONTENT_LENGTH_HEADER }&.last || ''
     end
 
-    def self.extract_headers_to_log(http_logging_config, headers)
+    def self.extract_headers_to_log(http_logging_config, mask_sensitive_headers, headers)
       return headers if headers.nil?
 
       filtered_headers = if http_logging_config.headers_to_include.any?
@@ -34,7 +34,8 @@ module CoreLibrary
                            headers
                          end
 
-      mask_sensitive_headers(filtered_headers, http_logging_config.headers_to_unmask)
+      apply_masking_to_sensitive_headers(filtered_headers, mask_sensitive_headers,
+                                         http_logging_config.headers_to_unmask)
     end
 
     def self.include_headers(headers, headers_to_include)
@@ -60,14 +61,16 @@ module CoreLibrary
       excluded_headers
     end
 
-    def self.mask_sensitive_headers(headers, headers_to_unmask)
-      return headers unless @mask_sensitive_headers || !headers.nil?
+    def self.apply_masking_to_sensitive_headers(headers, mask_sensitive_headers, headers_to_unmask)
+      return headers unless mask_sensitive_headers
+      return headers if headers.nil?
 
+      masked_headers = {}
       headers.each do |key, val|
-        headers[key] = mask_if_sensitive_header(key, val, headers_to_unmask)
+        masked_headers[key] = mask_if_sensitive_header(key, val, headers_to_unmask)
       end
 
-      headers
+      masked_headers
     end
 
     def self.mask_if_sensitive_header(name, value, headers_to_unmask)
@@ -76,7 +79,7 @@ module CoreLibrary
       name_downcase = name.downcase
 
       NON_SENSITIVE_HEADERS.include?(name_downcase) || headers_to_unmask.include?(name_downcase) ?
-        value : '**Redacted**'
+        value : REDACTED
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apimatic_core
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - APIMatic Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apimatic_core_interfaces