Merge pull request #59 from jasonmwebb-lv/master

Added "enterprise" as possible list of values that can be deserialized
zingz0r · Jul 25, 2022 · b448bca · b448bca
2 parents b5c23ed + cf141be
commit b448bca
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/CloudFlare.Client.Test/Accounts/AccountsUnitTests.cs b/CloudFlare.Client.Test/Accounts/AccountsUnitTests.cs
@@ -67,6 +67,24 @@ public async Task TestGetAccountDetailsAsync()
             accountDetails.Result.Should().BeEquivalentTo(account);
         }
 
+        [Fact]
+        public async Task TestGetAccountDetailsOnEnterpriseAsync()
+        {
+            var account = AccountTestData.Accounts.Last();
+
+            _wireMockServer
+                .Given(Request.Create().WithPath($"/{AccountEndpoints.Base}/{account.Id}").UsingGet())
+                .RespondWith(Response.Create().WithStatusCode(200)
+                    .WithBody(WireMockResponseHelper.CreateTestResponse(account)));
+
+            using var client = new CloudFlareClient(WireMockConnection.ApiKeyAuthentication, _connectionInfo);
+
+            var accountDetails = await client.Accounts.GetDetailsAsync(account.Id);
+
+            accountDetails.Result.Should().BeEquivalentTo(account);
+            accountDetails.Result.Type.Should().Be(AccountType.Enterprise);
+        }
+
         [Fact]
         public async Task UpdateAccountAsync()
         {

diff --git a/CloudFlare.Client.Test/Serialization/Enumerators/AccountTypeTest.cs b/CloudFlare.Client.Test/Serialization/Enumerators/AccountTypeTest.cs
@@ -11,7 +11,7 @@ public class AccountTypeTest
         [Fact]
         public void TestSerialization()
         {
-            JsonHelper.GetSerializedEnums<AccountType>().Should().BeEquivalentTo(new SortedSet<string> { "standard" });
+            JsonHelper.GetSerializedEnums<AccountType>().Should().BeEquivalentTo(new SortedSet<string> { "standard", "enterprise" });
         }
     }
-}
+}
diff --git a/CloudFlare.Client.Test/TestData/AccountTestData.cs b/CloudFlare.Client.Test/TestData/AccountTestData.cs
@@ -25,6 +25,23 @@ public static class AccountTestData
                     EnforceTwoFactorAuthentication = false,
                     AccessApprovalExpiry = null
                 }
+            },
+            new Account
+            {
+                CreatedOn = DateTime.UtcNow,
+                Id = "9018a5658j8e64153adb7aa01sd619fd",
+                Name = "Harry Potter",
+                Type = AccountType.Enterprise,
+                LegacyFlags =
+                    new LegacyFlags
+                    {
+                        EnterpriseZoneQuota = new EnterpriseZoneQuota { Available = 0, Current = 0, Maximum = 0 }
+                    },
+                Settings = new AdditionalAccountSettings
+                {
+                    EnforceTwoFactorAuthentication = false,
+                    AccessApprovalExpiry = null
+                }
             }
         };
     }

diff --git a/CloudFlare.Client/Enumerators/AccountType.cs b/CloudFlare.Client/Enumerators/AccountType.cs
@@ -14,6 +14,12 @@ public enum AccountType
         /// Standard
         /// </summary>
         [EnumMember(Value = "standard")]
-        Standard
+        Standard,
+
+        /// <summary>
+        /// Enterprise
+        /// </summary>
+        [EnumMember(Value = "enterprise")]
+        Enterprise
     }
 }