Propagate BaseUrl property to generated http client

Author: C0nquistadore

src/Dibix.Http.Client/Client/UriBuilder.cs

@@ -8,52 +8,64 @@ namespace Dibix.Http.Client
 {
     public sealed class UriBuilder
     {
-        private readonly string _url;
         private readonly UriKind _kind;
         private readonly IDictionary<string, ICollection<string>> _params;
+        private string _url;
 
         private UriBuilder(string url, UriKind kind)
         {
-            this._url = url;
-            this._kind = kind;
-            this._params = new Dictionary<string, ICollection<string>>();
+            _url = url;
+            _kind = kind;
+            _params = new Dictionary<string, ICollection<string>>();
         }
 
         public static UriBuilder Create(string url, UriKind kind = UriKind.Absolute) => new UriBuilder(url, kind);
 
-        public UriBuilder AddQueryParam<T>(string name, T value) where T : struct => this.AddQueryParam(name, ToString(value));
+        public UriBuilder AddPath(string path)
+        {
+            StringBuilder sb = new StringBuilder(_url);
+            if (sb[^1] != '/')
+                sb.Append('/');
+
+            sb.Append(path);
+
+            _url = sb.ToString();
+            return this;
+        }
+
+        public UriBuilder AddQueryParam<T>(string name, T value) where T : struct => AddQueryParam(name, ToString(value));
         public UriBuilder AddQueryParam<T>(string name, T value, T defaultValue) where T : struct => !Equals(value, defaultValue) ? AddQueryParam(name, ToString(value)) : this;
-        public UriBuilder AddQueryParam<T>(string name, T? value) where T : struct => this.AddQueryParam(name, ToString(value));
+        public UriBuilder AddQueryParam<T>(string name, T? value) where T : struct => AddQueryParam(name, ToString(value));
         public UriBuilder AddQueryParam<T>(string name, T? value, T? defaultValue) where T : struct => !Equals(value, defaultValue) ? AddQueryParam(name, ToString(value)) : this;
         public UriBuilder AddQueryParam(string name, string value, string defaultValue) => !Equals(value, defaultValue) ? AddQueryParam(name, ToString(value)) : this;
         public UriBuilder AddQueryParam(string name, string value)
         {
-            if (!this._params.TryGetValue(name, out ICollection<string> values))
+            if (!_params.TryGetValue(name, out ICollection<string> values))
             {
                 values = new Collection<string>();
-                this._params.Add(name, values);
+                _params.Add(name, values);
             }
             values.Add(value);
             return this;
         }
         public UriBuilder AddQueryParam<T>(string name, IEnumerable<T> values)
         {
             foreach (T value in values)
-                this.AddQueryParam(name, ToString(value));
+                AddQueryParam(name, ToString(value));
 
             return this;
         }
 
         public Uri Build()
         {
-            StringBuilder sb = new StringBuilder(this._url);
+            StringBuilder sb = new StringBuilder(_url);
 
-            if (this._params.Any())
+            if (_params.Any())
             {
                 sb.Append('?');
 
                 bool firstParam = true;
-                foreach (KeyValuePair<string, ICollection<string>> param in this._params)
+                foreach (KeyValuePair<string, ICollection<string>> param in _params)
                 {
                     foreach (string value in param.Value)
                     {
@@ -75,7 +87,7 @@ public Uri Build()
             }
 
             string uri = sb.ToString();
-            return new Uri(uri, this._kind);
+            return new Uri(uri, _kind);
         }
 
         private static string ToString<T>(T value)

src/Dibix.Sdk.Cli/Commands/Artifact/AbandonArtifactCommand.cs

@@ -27,7 +27,7 @@ public AbandonArtifactCommand() : base("abandon", "Unlists NuGet package(s) from
                 Arity = ArgumentArity.ZeroOrOne
             };
             _nuGetApiKeyOption = new EnvironmentVariableOption("--nuget-api-key", EnvironmentVariableName.NuGetPackageOfficialFeedApiKey, "The API key used to unlist the package(s) from the official feed.", "-n");
-            _dockerHubUserNameOption = new EnvironmentVariableOption("--docker-hub-user", EnvironmentVariableName.DockerHubUserName, "The user name used to delete the docker image(s) from the Docker Hub.", "-u");
+            _dockerHubUserNameOption = new EnvironmentVariableOption("--docker-hub-username", EnvironmentVariableName.DockerHubUserName, "The user name used to delete the docker image(s) from the Docker Hub.", "-u");
             _dockerHubPasswordOption = new EnvironmentVariableOption("--docker-hub-password", EnvironmentVariableName.DockerHubPassword, "The password used to delete the docker image(s) from the Docker Hub.", "-p");
             _dockerOrganizationOption = new Option<string>("--docker-organization", "-o")
             {

src/Dibix.Sdk.Cli/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Dibix.Sdk.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "artifact abandon dibix-http-host"
+      "commandLineArgs": "artifact deploy Dibix.Sdk"
     }
   }
 }

src/Dibix.Sdk.Cli/Utilities/NuGetPackageExpander.cs

@@ -35,6 +35,14 @@ public static void Expand(string packageName, string packageVersion, string nupk
                 string targetPath = Path.GetFullPath(Path.Combine(targetDirectory, targetFileName));
                 Directory.CreateDirectory(Path.GetDirectoryName(targetPath)!);
                 entry.ExtractToFile(targetPath, overwrite: true);
+
+                // NuGet packs files using the source's UtcDateTime but stores it in the zip's DOS local-time slot (the ZIP format has no native UTC field).
+                // ZipArchiveEntry.ExtractToFile reapplies the value as local time, which drifts the timestamp by the current UTC offset.
+                // Re-tag the wall-clock face value as UTC and apply via SetLastWriteTimeUtc to round-trip the original instant, mirroring `nuget.exe add -Expand`.
+                // See:
+                // https://github.com/NuGet/Home/issues/7395
+                // https://github.com/NuGet/Home/issues/5240
+                File.SetLastWriteTimeUtc(targetPath, DateTime.SpecifyKind(entry.LastWriteTime.DateTime, DateTimeKind.Utc));
             }
 
             string nupkgFileName = $"{idLower}.{packageVersion}.nupkg";

src/Dibix.Sdk.CodeGeneration/Output/ApiClientImplementationWriter.cs

@@ -131,19 +131,22 @@ bool CollectParameter(ApiParameter parameter)
             writer.WriteLine($"using {nameof(HttpClient)} client = _httpClientFactory.CreateClient(_httpClientName);");
 
             string uri = RouteBuilder.BuildRoute(context.Model.AreaName, controller.Name, action.ChildRoute);
-            string uriConstant = $"\"{uri}\"";
-            if (uriConstant.Contains('{'))
-                uriConstant = $"${uriConstant}";
-
             ICollection<ApiParameter> queryParameters = parameters.Where(x => x.ParameterLocation == ActionParameterLocation.Query)
                                                                   .ToArray();
 
+            string uriConstant;
             if (queryParameters.Any())
             {
                 context.AddUsing("UriBuilder = Dibix.Http.Client.UriBuilder");
 
-                writer.WriteLine($"{nameof(Uri)} uri = UriBuilder.Create({uriConstant}, {nameof(UriKind)}.{nameof(UriKind.Relative)})")
-                      .SetTemporaryIndent(20);
+                writer.WriteLine($"{nameof(Uri)} uri = UriBuilder.Create(HttpClientConstants.BaseUrl, {nameof(UriKind)}.{nameof(UriKind.Relative)})")
+                      .SetTemporaryIndent(20)
+                      .Write(".AddPath(");
+
+                if (uri.Contains('{'))
+                    writer.WriteRaw('$');
+
+                writer.WriteLineRaw($"\"{uri}\")");
 
                 foreach (ApiParameter parameter in queryParameters)
                 {
@@ -166,6 +169,12 @@ bool CollectParameter(ApiParameter parameter)
 
                 uriConstant = "uri";
             }
+            else
+            {
+                uriConstant = $$"""
+                                $"{HttpClientConstants.BaseUrl}/{{uri}}"
+                                """;
+            }
 
             writer.WriteLine($"{nameof(HttpRequestMessage)} requestMessage = new {nameof(HttpRequestMessage)}(new {nameof(HttpMethod)}(\"{action.Method.ToString().ToUpperInvariant()}\"), {uriConstant});");
 

src/Dibix.Sdk.CodeGeneration/Output/ApiClientWriter.cs

@@ -8,15 +8,9 @@
 
 namespace Dibix.Sdk.CodeGeneration
 {
-    internal abstract class ApiClientWriter : ArtifactWriterBase
+    internal abstract class ApiClientWriter : ClientWriter
     {
-        #region Properties
-        public override string LayerName => CodeGeneration.LayerName.Client;
-        #endregion
-
         #region Overrides
-        public override bool HasContent(CodeGenerationModel model) => model.Controllers.Any();
-
         public override void Write(CodeGenerationContext context)
         {
             context.AddUsing("Dibix.Http.Client");

src/Dibix.Sdk.CodeGeneration/Output/ClientCodeGenerator.cs

@@ -16,6 +16,7 @@ protected override IEnumerable<ArtifactWriterBase> SelectWriters(CodeGenerationM
             yield return new ClientContractClassWriter(model);
             yield return new ApiClientInterfaceWriter();
             yield return new ApiClientImplementationWriter();
+            yield return new SharedApiConstantsWriter();
         }
 
         protected override IEnumerable<CSharpGlobalAnnotation> CollectGlobalAnnotations(CodeGenerationModel model)

src/Dibix.Sdk.CodeGeneration/Output/ClientWriter.cs

@@ -0,0 +1,12 @@
+using System.Linq;
+
+namespace Dibix.Sdk.CodeGeneration
+{
+    internal abstract class ClientWriter : ArtifactWriterBase
+    {
+        public override string LayerName => CodeGeneration.LayerName.Client;
+
+        public override bool HasContent(CodeGenerationModel model) => model.Controllers.Any();
+
+    }
+}

src/Dibix.Sdk.CodeGeneration/Output/SharedApiConstantsWriter.cs

@@ -0,0 +1,20 @@
+using Dibix.Sdk.CodeGeneration.CSharp;
+
+namespace Dibix.Sdk.CodeGeneration
+{
+    internal sealed class SharedApiConstantsWriter : ClientWriter
+    {
+        #region Properties
+        public override string RegionName => "Shared";
+        #endregion
+
+        #region Overrides
+        public override void Write(CodeGenerationContext context)
+        {
+            context.Namespace()
+                   .AddClass("HttpClientConstants", CSharpModifiers.Internal | CSharpModifiers.Static)
+                   .AddField("BaseUrl", "string", new CSharpValue($"\"{context.Model.BaseUrl}\""), CSharpModifiers.Public | CSharpModifiers.Const);
+        }
+        #endregion
+    }
+}

tests/Dibix.Http.Client.Tests/UriBuilderTest.cs

@@ -9,7 +9,8 @@ public sealed class UriBuilderTest
         [TestMethod]
         public void CrossCheck()
         {
-            Uri uri = UriBuilder.Create("some/kind/{of}/uri", UriKind.Relative)
+            Uri uri = UriBuilder.Create("some", UriKind.Relative)
+                                .AddPath("kind/{of}/uri")
                                 .AddQueryParam("name", "luke")
                                 .AddQueryParam("id", (int?)null)
                                 .AddQueryParam("omitdefaultnullint", (int?)null, null)