From 44d28978397272e9353a6816d7e8270d0f38fdef Mon Sep 17 00:00:00 2001
From: Bryan Apellanes <63638027+bryanapellanes-okta@users.noreply.github.com>
Date: Thu, 12 Sep 2024 13:51:17 -0500
Subject: [PATCH] OKTA-745408 mergeconfigurations sets useproxy (#741)

---
 API_README.md                                  |  2 +-
 openapi3/config.json                           |  2 +-
 openapi3/templates/Configuration.mustache      |  1 +
 .../Client/OktaConfigurationShould.cs          | 18 ++++++++++++++++++
 src/Okta.Sdk/Client/Configuration.cs           |  5 +++--
 src/Okta.Sdk/Okta.Sdk.csproj                   |  2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/API_README.md b/API_README.md
index a20f14429..e7a526490 100644
--- a/API_README.md
+++ b/API_README.md
@@ -5,7 +5,7 @@ Allows customers to easily access the Okta Management APIs
 This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 5.1.0
-- SDK version: 8.1.2
+- SDK version: 8.1.3
 - Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
     For more information, please visit [https://developer.okta.com/](https://developer.okta.com/)
 
diff --git a/openapi3/config.json b/openapi3/config.json
index dafaa7e17..9ca095970 100644
--- a/openapi3/config.json
+++ b/openapi3/config.json
@@ -6,7 +6,7 @@
     "packageName" : "Okta.Sdk",
     "outputDir" : "../",
     "inputSpec" : "./management.yaml", 
-    "packageVersion" : "8.1.2",
+    "packageVersion" : "8.1.3",
     "packageDescription" : "Official .NET SDK for the Okta API",
     "packageTitle" : "Official .NET SDK for the Okta API",
     "packageCompany" : "Okta, Inc.",
diff --git a/openapi3/templates/Configuration.mustache b/openapi3/templates/Configuration.mustache
index 97ac9d249..b42aa07e4 100644
--- a/openapi3/templates/Configuration.mustache
+++ b/openapi3/templates/Configuration.mustache
@@ -885,6 +885,7 @@ namespace {{packageName}}.Client
                 PrivateKey = second.PrivateKey ?? first.PrivateKey,
                 DisableOktaDomainCheck = second.DisableOktaDomainCheck ?? first.DisableOktaDomainCheck,
                 DisableHttpsCheck = second.DisableHttpsCheck ?? first.DisableHttpsCheck,
+                UseProxy = second.UseProxy ?? first.UseProxy,
             };
             return config;
         }
diff --git a/src/Okta.Sdk.UnitTest/Client/OktaConfigurationShould.cs b/src/Okta.Sdk.UnitTest/Client/OktaConfigurationShould.cs
index 9c87c42ec..622db18f0 100644
--- a/src/Okta.Sdk.UnitTest/Client/OktaConfigurationShould.cs
+++ b/src/Okta.Sdk.UnitTest/Client/OktaConfigurationShould.cs
@@ -216,5 +216,23 @@ public void NotFailWhenAccessTokenProvidedAndAuthorizationModeIsOAuthAccessToken
             action.Should().NotThrow();
         }
 
+        [Fact]
+        public void MergeConfigurations()
+        {
+            var firstConfig = new Configuration
+            {
+            };
+            firstConfig.UseProxy.Should().BeTrue();
+            firstConfig.Proxy.Should().BeNull();
+            var secondConfig = new Configuration
+            {
+                UseProxy = false,
+                Proxy = new ProxyConfiguration()
+            };
+
+            var config = Configuration.MergeConfigurations(firstConfig, secondConfig);
+            config.UseProxy.Should().BeFalse();
+            config.Proxy.Should().NotBeNull();
+        }
     }
 }
diff --git a/src/Okta.Sdk/Client/Configuration.cs b/src/Okta.Sdk/Client/Configuration.cs
index 5ffd406ab..e20ffeb90 100644
--- a/src/Okta.Sdk/Client/Configuration.cs
+++ b/src/Okta.Sdk/Client/Configuration.cs
@@ -39,7 +39,7 @@ public class Configuration : IReadableConfiguration
         /// Version of the package.
         /// </summary>
         /// <value>Version of the package.</value>
-        public const string Version = "8.1.2";
+        public const string Version = "8.1.3";
 
         /// <summary>
         /// Identifier for ISO 8601 DateTime Format
@@ -766,7 +766,7 @@ public static string ToDebugReport()
             report += "    OS: " + System.Environment.OSVersion + "\n";
             report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
             report += "    Version of the API: 5.1.0\n";
-            report += "    SDK Package Version: 8.1.2\n";
+            report += "    SDK Package Version: 8.1.3\n";
 
             return report;
         }
@@ -837,6 +837,7 @@ public static IReadableConfiguration MergeConfigurations(IReadableConfiguration
                 PrivateKey = second.PrivateKey ?? first.PrivateKey,
                 DisableOktaDomainCheck = second.DisableOktaDomainCheck ?? first.DisableOktaDomainCheck,
                 DisableHttpsCheck = second.DisableHttpsCheck ?? first.DisableHttpsCheck,
+                UseProxy = second.UseProxy ?? first.UseProxy,
             };
             return config;
         }
diff --git a/src/Okta.Sdk/Okta.Sdk.csproj b/src/Okta.Sdk/Okta.Sdk.csproj
index 2094e7699..a47edb1ea 100644
--- a/src/Okta.Sdk/Okta.Sdk.csproj
+++ b/src/Okta.Sdk/Okta.Sdk.csproj
@@ -13,7 +13,7 @@
     <Description>Official .NET SDK for the Okta API</Description>
     <Copyright>Okta, Inc.</Copyright>
     <RootNamespace>Okta.Sdk</RootNamespace>
-    <Version>8.1.2</Version>
+    <Version>8.1.3</Version>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Okta.Sdk.xml</DocumentationFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>