microsoft_kiota_abstractions 0.25.2 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab594b471705d419a392d73fd99f80f2e5b0e2b80ff8fd4ae5fd25ba18aaa37
-  data.tar.gz: 6e2fb313b636b5ea1f8ccbec0c45f08cb8f5c74f2d9f8957164777d20f34c1bf
+  metadata.gz: 86e29962236a43fe36f9606ce411217392788b49899ba76c53100aa109b0fd69
+  data.tar.gz: a508765b80eba3cc0ea4143cf9d5cc76cd960a1b0340498b862eab12b0efe683
 SHA512:
-  metadata.gz: 87928b86bc8de81578ccbb7afac4d0c5f76afa2fa2625464a2981b7fc9bb62e918377cecb317faf6d6921c7407fc998bfe8b946e960876bca9c863daf04efd2e
-  data.tar.gz: ee398afe305ba8ad89b92eff176e55e9a5d96a16b2e52b21abddf5c3c02aa0c9212dad0cb843b734ed814a99178e88b227232a834e81aa07070c3278496a3ae8
+  metadata.gz: 19e2eb208ceeac2a34a7977b47af90348e6a8c4818e40f01da2adc2c82219cb88bd29fbcd7711c650a7f4f0f8ff2487a41464fa34cac6f48ffeb928f613c639f
+  data.tar.gz: a0e5573e8f792325c3403ccfd523d694228540a615fed49054201903658ea53c1a76ba8d6b151b4e69904985e07f1aeb7952fba15dbef2297595c18f46970278

data/lib/microsoft_kiota_abstractions/authentication/base_bearer_token_authentication_provider.rb

@@ -2,6 +2,7 @@
 
 require_relative 'authentication_provider'
 require_relative 'access_token_provider'
+require_relative '../request_headers'
 
 module MicrosoftKiotaAbstractions
   # Provides a base class for implementing AuthenticationProvider for Bearer token scheme
@@ -19,16 +20,41 @@ module MicrosoftKiotaAbstractions
       raise StandardError, 'Request cannot be null' if request.nil?
 
       # If request contains already an authorization header, nothing needs to be done.
-      if request.headers.get_all.key?(AUTHORIZATION_HEADER_KEY)
+      has_auth_header = if request.headers.respond_to?(:key?)
+                          request.headers.key?(AUTHORIZATION_HEADER_KEY)
+                        elsif request.headers.respond_to?(:get_all) && request.headers.get_all
+                          request.headers.get_all.keys.any? { |k| k.to_s.casecmp?(AUTHORIZATION_HEADER_KEY) }
+                        else
+                          false
+                        end
+
+      if has_auth_header
         Fiber.new do
         end
       else
         Fiber.new do
           auth_fiber = @access_token_provider.get_authorization_token(request.uri, additional_properties)
           token = auth_fiber.resume if auth_fiber
-          request.headers.add(AUTHORIZATION_HEADER_KEY, "Bearer #{token}") unless token.nil? || token.empty?
+          unless token.nil? || token.empty?
+            headers = ensure_request_headers(request)
+            headers.add(AUTHORIZATION_HEADER_KEY, "Bearer #{token}")
+          end
         end
       end
     end
+
+    private
+
+    def ensure_request_headers(request)
+      return request.headers unless request.headers.nil?
+
+      headers = RequestHeaders.new
+      if request.respond_to?(:headers=)
+        request.headers = headers
+      elsif request.instance_variable_defined?(:@headers)
+        request.instance_variable_set(:@headers, headers)
+      end
+      headers
+    end
   end
 end

data/lib/microsoft_kiota_abstractions/request_headers.rb

@@ -7,46 +7,60 @@ module MicrosoftKiotaAbstractions
     end
 
     def add(key, value)
-      if key.nil? || key.empty? || value.nil? || value.empty?
+      if key.nil? || key.to_s.empty? || value.nil? || (value.respond_to?(:empty?) && value.empty?)
         raise ArgumentError, 'key and value cannot be nil or empty'
       end
 
-      existing_value = @headers[key]
-      if existing_value.nil?
+      key = key.to_s
+      existing_key = find_key(key)
+      if existing_key.nil?
         @headers[key] = if value.is_a?(Array)
-                          value
+                          value.map(&:to_s)
                         else
                           [value.to_s]
                         end
       elsif value.is_a?(Array)
-        @headers[key] = existing_value | value
+        @headers[existing_key] = @headers[existing_key] | value.map(&:to_s)
       else
-        existing_value << value.to_s
+        @headers[existing_key] = @headers[existing_key] | [value.to_s]
       end
     end
 
     def try_add(key, value)
-      if key.nil? || key.empty? || value.nil? || value.empty?
+      if key.nil? || key.to_s.empty? || value.nil? || (value.respond_to?(:empty?) && value.empty?)
         raise ArgumentError, 'key and value cannot be nil or empty'
       end
 
-      existing_value = @headers[key]
-      return false unless existing_value.nil? || existing_value.empty?
+      key = key.to_s
+      existing_key = find_key(key)
+      return false if existing_key && !@headers[existing_key].empty?
 
-      @headers[key] = [value.to_s]
+      @headers[existing_key || key] = if value.is_a?(Array)
+                                        value.map(&:to_s)
+                                      else
+                                        [value.to_s]
+                                      end
       true
     end
 
     def get(key)
-      raise ArgumentError, 'key cannot be nil or empty' if key.nil? || key.empty?
+      raise ArgumentError, 'key cannot be nil or empty' if key.nil? || key.to_s.empty?
 
-      @headers[key]
+      existing_key = find_key(key.to_s)
+      existing_key ? @headers[existing_key] : nil
     end
 
     def remove(key)
-      raise ArgumentError, 'key cannot be nil or empty' if key.nil? || key.empty?
+      raise ArgumentError, 'key cannot be nil or empty' if key.nil? || key.to_s.empty?
 
-      @headers.delete(key)
+      existing_key = find_key(key.to_s)
+      @headers.delete(existing_key) if existing_key
+    end
+
+    def key?(key)
+      return false if key.nil? || key.to_s.empty?
+
+      !find_key(key.to_s).nil?
     end
 
     def clear
@@ -56,5 +70,26 @@ module MicrosoftKiotaAbstractions
     def get_all
       @headers
     end
+
+    def add_all(other)
+      return if other.nil?
+
+      if other.respond_to?(:get_all)
+        other.get_all.each { |k, v| add(k.to_s, v) }
+      elsif other.is_a?(Hash)
+        other.each { |k, v| add(k.to_s, v) }
+      end
+    end
+
+    private
+
+    def find_key(key)
+      return key if @headers.key?(key)
+
+      key_str = key.to_s
+      return key_str if @headers.key?(key_str)
+
+      @headers.keys.find { |k| k.to_s.casecmp?(key_str) }
+    end
   end
 end

data/lib/microsoft_kiota_abstractions/request_information.rb

@@ -10,7 +10,8 @@ require_relative 'request_headers'
 
 module MicrosoftKiotaAbstractions
   class RequestInformation
-    attr_reader :content, :http_method, :headers
+    attr_reader :content, :http_method
+    attr_writer :headers
     attr_accessor :url_template, :path_parameters, :query_parameters
 
     @@binary_content_type = 'application/octet-stream'
@@ -23,6 +24,10 @@ module MicrosoftKiotaAbstractions
       @path_parameters = {}
     end
 
+    def headers
+      @headers ||= RequestHeaders.new
+    end
+
     def uri=(arg)
       raise ArgumentError, 'arg cannot be nil or empty' if arg.nil? || arg.empty?
 
@@ -35,6 +40,8 @@ module MicrosoftKiotaAbstractions
       return @uri unless @uri.nil?
 
       if path_parameters[@@raw_url_key].nil?
+        raise StandardError, 'url_template cannot be nil or empty' if @url_template.nil? || @url_template.empty?
+
         values = path_parameters.merge(query_parameters).transform_values { |v| template_value(v) }
         return URI(StdUriTemplate.expand(@url_template, values))
       end
@@ -82,7 +89,7 @@ module MicrosoftKiotaAbstractions
     def set_stream_content(value = $stdin, content_type)
       @content = value
       content_type = @@binary_content_type if content_type.nil? || content_type.empty?
-      @headers.try_add(@@content_type_header, content_type)
+      headers.try_add(@@content_type_header, content_type)
     end
 
     SCALAR_WRITERS = {
@@ -101,7 +108,7 @@ module MicrosoftKiotaAbstractions
 
     def set_content_from_scalar(request_adapter, content_type, values)
       writer = request_adapter.get_serialization_writer_factory.get_serialization_writer(content_type)
-      @headers.try_add(@@content_type_header, content_type)
+      headers.try_add(@@content_type_header, content_type)
       if values.is_a?(Array)
         writer.write_collection_of_primitive_values(nil, values)
       else
@@ -118,9 +125,9 @@ module MicrosoftKiotaAbstractions
       if values.is_a?(MultipartBody)
         content_type = "#{content_type.gsub(/;\s*boundary=[^;]*/i, '')}; boundary=#{values.boundary}"
         values.request_adapter = request_adapter
-        @headers.remove(@@content_type_header)
+        headers.remove(@@content_type_header)
       end
-      @headers.try_add(@@content_type_header, content_type)
+      headers.try_add(@@content_type_header, content_type)
       if !values.nil? && values.is_a?(Array)
         writer.write_collection_of_object_values(nil, values)
       else
@@ -130,7 +137,9 @@ module MicrosoftKiotaAbstractions
     end
 
     def add_headers_from_raw_object(h)
-      h&.get_all&.select { |x, y| @headers.add(x.to_s, y) }
+      return if h.nil?
+
+      headers.add_all(h)
     end
 
     def set_query_string_parameters_from_raw_object(q)
@@ -147,7 +156,7 @@ module MicrosoftKiotaAbstractions
         rescue StandardError
           key = method_name
         end
-        value = eval("q.#{method_name}")
+        value = q.public_send(x)
         query_parameters[key] = value unless value.nil?
       end
     end

data/lib/microsoft_kiota_abstractions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaAbstractions
-  VERSION = '0.25.2' # x-release-please-version
+  VERSION = '0.25.3' # x-release-please-version
 end

data/microsoft_kiota_abstractions.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.add_dependency 'iso8601', '~> 0.13.0'
-  spec.add_dependency 'stduritemplate', '>= 0.0.39', '< 2.1.0'
+  spec.add_dependency 'stduritemplate', '>= 2.0.13', '< 2.1.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_abstractions
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.25.3
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.39
+        version: 2.0.13
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.1.0
@@ -39,7 +39,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.39
+        version: 2.0.13
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.1.0