Merge pull request #795 from microsoft/feature/base-url

adds support for base url

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added support for changing the base url #795
+
 ### Changed
 
 - Fixes a bug where arrays of enums could be wrongly mapped.

abstractions/dotnet/src/IRequestAdapter.cs

@@ -58,5 +58,9 @@ public interface IRequestAdapter
         /// <param name="responseHandler">The response handler to use for the HTTP request instead of the default handler.</param>
         /// <returns>A Task to await completion.</returns>
         Task SendNoContentAsync(RequestInformation requestInfo, IResponseHandler responseHandler = default);
+        /// <summary>
+        /// The base url for every request.
+        /// </summary>
+        string BaseUrl { get; set; }
     }
 }

abstractions/dotnet/src/Microsoft.Kiota.Abstractions.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/microsoft/kiota</RepositoryUrl>
-    <Version>1.0.22</Version>
+    <Version>1.0.23</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Enable this line once we go live to prevent breaking changes -->

abstractions/go/request_adapter.go

@@ -55,4 +55,8 @@ type RequestAdapter interface {
 	GetSerializationWriterFactory() s.SerializationWriterFactory
 	// Enables the backing store proxies for the SerializationWriters and ParseNodes in use.
 	EnableBackingStore()
+	// Sets the base url for every request.
+	SetBaseUrl(baseUrl string)
+	// Gets the base url for every request.
+	GetBaseUrl() string
 }

abstractions/java/lib/build.gradle

@@ -48,7 +48,7 @@ publishing {
     publications {
         gpr(MavenPublication) {
             artifactId 'kiota-abstractions'
-            version '1.0.22'
+            version '1.0.23'
             from(components.java)
         }
     }

abstractions/java/lib/src/main/java/com/microsoft/kiota/RequestAdapter.java

@@ -58,4 +58,15 @@ public interface RequestAdapter {
      * @return a {@link CompletableFuture} with the deserialized primitive collection response model.
      */
     <ModelType> CompletableFuture<Iterable<ModelType>> sendPrimitiveCollectionAsync(@Nonnull final RequestInformation requestInfo, @Nonnull final Class<ModelType> targetClass, @Nullable final ResponseHandler responseHandler);
+    /**
+     * Sets The base url for every request.
+     * @param baseUrl The base url for every request.
+     */
+    void setBaseUrl(@Nonnull final String baseUrl);
+    /**
+     * Gets The base url for every request.
+     * @return The base url for every request.
+     */
+    @Nonnull
+    String getBaseUrl();
 }

abstractions/ruby/microsoft_kiota_abstractions/lib/microsoft_kiota_abstractions/request_adapter.rb

@@ -13,5 +13,13 @@ def get_serialization_writer_factory()
       raise NotImplementedError.new
     end
 
+    def set_base_url(base_url)
+      raise NotImplementedError.new
+    end
+
+    def get_base_url()
+      raise NotImplementedError.new
+    end
+
   end
 end

abstractions/ruby/microsoft_kiota_abstractions/lib/microsoft_kiota_abstractions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaAbstractions
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

abstractions/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/kiota-abstractions",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "Core abstractions for kiota generated libraries in TypeScript and JavaScript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

abstractions/typescript/src/requestAdapter.ts

@@ -59,4 +59,6 @@ export interface RequestAdapter {
      * @param backingStoreFactory the backing store factory to use.
      */
     enableBackingStore(backingStoreFactory?: BackingStoreFactory | undefined): void;
+    /** The base url for every request. */
+    baseUrl: string;
 }

http/dotnet/httpclient/Microsoft.Kiota.Http.HttpClientLibrary.Tests/Extensions/HttpRequestMessageExtensionsTests.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Http.HttpClientLibrary.Extensions;
 using Microsoft.Kiota.Http.HttpClientLibrary.Middleware.Options;
 using Xunit;
@@ -14,6 +15,10 @@ namespace Microsoft.Kiota.Http.HttpClientLibrary.Tests.Extensions
 {
     public class HttpRequestMessageExtensionsTests
     {
+        private readonly HttpClientRequestAdapter requestAdapter;
+        public HttpRequestMessageExtensionsTests () {
+            requestAdapter = new HttpClientRequestAdapter(new AnonymousAuthenticationProvider());
+        }
         [Fact]
         public void GetRequestOptionCanExtractRequestOptionFromHttpRequestMessage()
         {
@@ -29,7 +34,7 @@ public void GetRequestOptionCanExtractRequestOptionFromHttpRequestMessage()
             };
             requestInfo.AddRequestOptions(redirectHandlerOption);
             // Act and get a request message
-            var requestMessage = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var requestMessage = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             var extractedOption = requestMessage.GetRequestOption<RedirectHandlerOption>();
             // Assert
             Assert.NotNull(extractedOption);
@@ -45,7 +50,7 @@ public async Task CloneAsyncWithEmptyHttpContent()
                 HttpMethod = HttpMethod.GET,
                 URI = new Uri("http://localhost")
             };
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             HttpRequestMessage clonedRequest = await originalRequest.CloneAsync();
 
             Assert.NotNull(clonedRequest);
@@ -63,7 +68,7 @@ public async Task CloneAsyncWithHttpContent()
                 URI = new Uri("http://localhost")
             };
             requestInfo.SetStreamContent(new MemoryStream(Encoding.UTF8.GetBytes("contents")));
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             originalRequest.Content = new StringContent("contents");
 
             var clonedRequest = await originalRequest.CloneAsync();
@@ -89,7 +94,7 @@ public async Task CloneAsyncWithRequestOption()
                 MaxRedirect = 7
             };
             requestInfo.AddRequestOptions(redirectHandlerOption);
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             originalRequest.Content = new StringContent("contents");
 
             var clonedRequest = await originalRequest.CloneAsync();
@@ -111,7 +116,7 @@ public void IsBufferedReturnsTrueForGetRequest()
                 HttpMethod = HttpMethod.GET,
                 URI = new Uri("http://localhost")
             };
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             // Act
             var response = originalRequest.IsBuffered();
             // Assert
@@ -126,7 +131,7 @@ public void IsBufferedReturnsTrueForPostWithNoContent()
                 HttpMethod = HttpMethod.POST,
                 URI = new Uri("http://localhost")
             };
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             // Act
             var response = originalRequest.IsBuffered();
             // Assert
@@ -143,7 +148,7 @@ public void IsBufferedReturnsTrueForPostWithBufferStringContent()
                 URI = new Uri("http://localhost"),
                 Content = new MemoryStream(data)
             };
-            var originalRequest = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var originalRequest = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             // Act
             var response = originalRequest.IsBuffered();
             // Assert

http/dotnet/httpclient/Microsoft.Kiota.Http.HttpClientLibrary.Tests/Middleware/TelemetryHandlerTests.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Http.HttpClientLibrary.Middleware;
 using Microsoft.Kiota.Http.HttpClientLibrary.Middleware.Options;
 using Xunit;
@@ -14,13 +15,15 @@ public class TelemetryHandlerTests
     {
         private readonly HttpMessageInvoker _invoker;
 
+        private readonly HttpClientRequestAdapter requestAdapter;
         public TelemetryHandlerTests()
         {
             var telemetryHandler = new TelemetryHandler
             {
                 InnerHandler = new FakeSuccessHandler()
             };
             this._invoker = new HttpMessageInvoker(telemetryHandler);
+            requestAdapter = new HttpClientRequestAdapter(new AnonymousAuthenticationProvider());
         }
 
         [Fact]
@@ -33,7 +36,7 @@ public async Task DefaultTelemetryHandlerDoesNotChangeRequest()
                 URI = new Uri("http://localhost")
             };
             // Act and get a request message
-            var requestMessage = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var requestMessage = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             Assert.Empty(requestMessage.Headers);
 
             // Act
@@ -64,7 +67,7 @@ public async Task TelemetryHandlerSelectivelyEnrichesRequestsBasedOnRequestMiddl
             // Configures the telemetry at the request level
             requestInfo.AddRequestOptions(telemetryHandlerOption);
             // Act and get a request message
-            var requestMessage = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var requestMessage = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
             Assert.Empty(requestMessage.Headers);
 
             // Act
@@ -102,7 +105,7 @@ public async Task TelemetryHandlerGloballyEnrichesRequests()
                 URI = new Uri("http://localhost")
             };
 
-            var requestMessage = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);// get a request message
+            var requestMessage = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);// get a request message
             Assert.Empty(requestMessage.Headers);
 
             // Act

http/dotnet/httpclient/Microsoft.Kiota.Http.HttpClientLibrary.Tests/HttpCoreTests.cs → http/dotnet/httpclient/Microsoft.Kiota.Http.HttpClientLibrary.Tests/RequestAdapterTests.cs

@@ -10,10 +10,12 @@ namespace Microsoft.Kiota.Http.HttpClientLibrary.Tests
     public class HttpClientRequestAdapterTests
     {
         private readonly IAuthenticationProvider _authenticationProvider;
+        private readonly HttpClientRequestAdapter requestAdapter;
 
         public HttpClientRequestAdapterTests()
         {
             _authenticationProvider = new Mock<IAuthenticationProvider>().Object;
+            requestAdapter = new HttpClientRequestAdapter(new AnonymousAuthenticationProvider());
         }
 
         [Fact]
@@ -56,7 +58,7 @@ public void GetRequestMessageFromRequestInformationSetsQueryParametersCorrectlyW
             requestInfo.QueryParameters.Add(queryParam, queryParamObject);
 
             // Act
-            var requestMessage = HttpClientRequestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
+            var requestMessage = requestAdapter.GetRequestMessageFromRequestInformation(requestInfo);
 
             // Assert
             Assert.NotNull(requestMessage.RequestUri);

http/dotnet/httpclient/src/HttpClientRequestAdapter.cs

@@ -51,6 +51,10 @@ public ISerializationWriterFactory SerializationWriterFactory
             }
         }
         /// <summary>
+        /// The base url for every request.
+        /// </summary>
+        public string BaseUrl { get; set; }
+        /// <summary>
         /// Send a <see cref="RequestInformation"/> instance with a collection instance of <typeparam name="ModelType"></typeparam>
         /// </summary>
         /// <param name="requestInfo">The <see cref="RequestInformation"/> instance to send</param>
@@ -199,8 +203,9 @@ private async Task<HttpResponseMessage> GetHttpResponseMessage(RequestInformatio
             return response;
         }
         private const string ContentTypeHeaderName = "content-type";
-        internal static HttpRequestMessage GetRequestMessageFromRequestInformation(RequestInformation requestInfo)
+        internal HttpRequestMessage GetRequestMessageFromRequestInformation(RequestInformation requestInfo)
         {
+            requestInfo.PathParameters.Add("baseurl", BaseUrl);
             var message = new HttpRequestMessage
             {
                 Method = new System.Net.Http.HttpMethod(requestInfo.HttpMethod.ToString().ToUpperInvariant()),

http/dotnet/httpclient/src/Microsoft.Kiota.Http.HttpClientLibrary.csproj

@@ -5,15 +5,15 @@
     <TargetFramework>net5.0</TargetFramework>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/microsoft/kiota</RepositoryUrl>
-    <Version>1.0.11</Version>
+    <Version>1.0.12</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!-- Enable this line once we go live to prevent breaking changes -->
     <!-- <PackageValidationBaselineVersion>1.0.0</PackageValidationBaselineVersion> -->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.22" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.23" />
   </ItemGroup>
 
 </Project>

http/go/nethttp/go.mod

@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/microsoft/kiota/abstractions/go v0.0.0-20211101171910-f479920da5ba
+	github.com/microsoft/kiota/abstractions/go v0.0.14
 	github.com/stretchr/testify v1.7.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

http/go/nethttp/nethttp_request_adapter.go

@@ -24,6 +24,8 @@ type NetHttpRequestAdapter struct {
 	httpClient *nethttp.Client
 	// authenticationProvider is the provider used to authenticate requests
 	authenticationProvider absauth.AuthenticationProvider
+	// The base url for every request.
+	baseUrl string
 }
 
 // NewNetHttpRequestAdapter creates a new NetHttpRequestAdapter with the given parameters
@@ -73,6 +75,7 @@ func NewNetHttpRequestAdapterWithParseNodeFactoryAndSerializationWriterFactoryAn
 		parseNodeFactory:           parseNodeFactory,
 		httpClient:                 httpClient,
 		authenticationProvider:     authenticationProvider,
+		baseUrl:                    "",
 	}
 	if result.httpClient == nil {
 		defaultClient := GetDefaultClient()
@@ -92,6 +95,12 @@ func (a *NetHttpRequestAdapter) GetSerializationWriterFactory() absser.Serializa
 func (a *NetHttpRequestAdapter) EnableBackingStore() {
 	//TODO implement when backing store is available for go
 }
+func (a *NetHttpRequestAdapter) SetBaseUrl(baseUrl string) {
+	a.baseUrl = baseUrl
+}
+func (a *NetHttpRequestAdapter) GetBaseUrl() string {
+	return a.baseUrl
+}
 func (a *NetHttpRequestAdapter) getHttpResponseMessage(requestInfo abs.RequestInformation) (*nethttp.Response, error) {
 	err := a.authenticationProvider.AuthenticateRequest(requestInfo)
 	if err != nil {
@@ -112,6 +121,7 @@ func (a *NetHttpRequestAdapter) getResponsePrimaryContentType(response *nethttp.
 	return strings.ToLower(splat[0])
 }
 func (a *NetHttpRequestAdapter) getRequestFromRequestInformation(requestInfo abs.RequestInformation) (*nethttp.Request, error) {
+	requestInfo.PathParameters["baseurl"] = a.GetBaseUrl()
 	uri, err := requestInfo.GetUri()
 	if err != nil {
 		return nil, err

http/java/okhttp/lib/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     implementation 'com.google.guava:guava:31.0.1-jre'
     api 'com.squareup.okhttp3:okhttp:4.9.2'
-    api 'com.microsoft.kiota:kiota-abstractions:1.0.22'
+    api 'com.microsoft.kiota:kiota-abstractions:1.0.23'
 }
 
 publishing {
@@ -53,7 +53,7 @@ publishing {
     publications {
         gpr(MavenPublication) {
             artifactId 'kiota-http-okhttplibrary'
-            version '1.0.11'
+            version '1.0.12'
             from(components.java)
         }
     }

http/java/okhttp/lib/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java

@@ -42,6 +42,14 @@ public class OkHttpRequestAdapter implements com.microsoft.kiota.RequestAdapter
     private final AuthenticationProvider authProvider;
     private ParseNodeFactory pNodeFactory;
     private SerializationWriterFactory sWriterFactory;
+    private String baseUrl = "";
+    public void setBaseUrl(@Nonnull final String baseUrl) {
+        this.baseUrl = Objects.requireNonNull(baseUrl);
+    }
+    @Nonnull
+    public String getBaseUrl() {
+        return baseUrl;
+    }
     public OkHttpRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider){
         this(authenticationProvider, null, null, null);
     }
@@ -214,6 +222,7 @@ private CompletableFuture<Response> getHttpResponseMessage(@Nonnull final Reques
 
     }
     private Request getRequestFromRequestInformation(@Nonnull final RequestInformation requestInfo) throws URISyntaxException, MalformedURLException {
+        requestInfo.pathParameters.put("baseurl", getBaseUrl());
         final RequestBody body = requestInfo.content == null ? null :
                                 new RequestBody() {
                                     @Override