Merge pull request #27 from hooktstudios/bugfix/base-url-in-authentication

Make sure the base url is set when calling authenticate_request

Author: baywet

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [0.14.0] - 2024-02-14
+
+### Changed
+
+- Make sure the base_url is set when calling authenticate_request. [#27](https://github.com/microsoft/kiota-http-ruby/pull/27)
+
 ## [0.13.0] - 2024-02-05
 
 ### Changed

lib/microsoft_kiota_faraday/faraday_request_adapter.rb

@@ -9,7 +9,7 @@ class FaradayRequestAdapter
     include MicrosoftKiotaAbstractions::RequestAdapter
 
     attr_accessor :authentication_provider, :content_type_header_key, :parse_node_factory, :serialization_writer_factory, :client
-    
+
     def initialize(authentication_provider, parse_node_factory=MicrosoftKiotaAbstractions::ParseNodeFactoryRegistry.default_instance, serialization_writer_factory=MicrosoftKiotaAbstractions::SerializationWriterFactoryRegistry.default_instance, client = KiotaClientFactory::get_default_http_client)
 
       if !authentication_provider
@@ -21,7 +21,7 @@ def initialize(authentication_provider, parse_node_factory=MicrosoftKiotaAbstrac
       if @parse_node_factory.nil?
         @parse_node_factory = MicrosoftKiotaAbstractions::ParseNodeFactoryRegistry.default_instance
       end
-      @serialization_writer_factory = serialization_writer_factory 
+      @serialization_writer_factory = serialization_writer_factory
       if @serialization_writer_factory.nil?
         @serialization_writer_factory = MicrosoftKiotaAbstractions::SerializationWriterFactoryRegistry.default_instance
       end
@@ -49,6 +49,7 @@ def send_async(request_info, factory, errors_mapping)
       raise StandardError, 'factory cannot be null' unless factory
 
       Fiber.new do
+        set_base_url_for_request_information(request_info)
         @authentication_provider.authenticate_request(request_info).resume
         request = self.get_request_from_request_info(request_info)
         response = @client.run_request(request.http_method, request.path, request.body, request.headers)
@@ -92,7 +93,7 @@ def throw_if_failed_reponse(response, errors_mapping)
     end
 
     def get_request_from_request_info(request_info)
-      request_info.path_parameters['baseurl'] = @base_url
+      set_base_url_for_request_information(request_info)
       case request_info.http_method
         when :GET
           request = @client.build_request(:get)
@@ -118,7 +119,7 @@ def get_request_from_request_info(request_info)
       request.path = request_info.uri
       unless request_info.headers.nil? then
         request.headers = Faraday::Utils::Headers.new
-        request_info.headers.get_all.select{|k,v| 
+        request_info.headers.get_all.select{|k,v|
           if v.kind_of? Array then
             request.headers[k] = v.join(',')
           elsif v.kind_of? String then
@@ -151,10 +152,16 @@ def get_response_content_type(response)
     def convert_to_native_request_async(request_info)
       raise StandardError, 'request_info cannot be null' unless request_info
       return Fiber.new do
+        set_base_url_for_request_information(request_info)
         @authentication_provider.authenticate_request(request_info).resume
         return self.get_request_from_request_info(request_info)
       end
     end
 
+    private
+
+    def set_base_url_for_request_information(request_info)
+      request_info.path_parameters['baseurl'] = @base_url
+    end
   end
 end

lib/microsoft_kiota_faraday/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaFaraday
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end