9 translate the preferred client mode names (#10)

* add mode translation * Update tests * Update Tests.cs * Update Tests.cs * Update Tests.cs * Update tests * Update TestTriggerChallenges.cs * Update tests coverage 77.1% * naming convention * fix SSLVerify setter * Update TestValidateCheck.cs * Update tests * Update tests 85.9% code coverage * Update PrivacyIDEA.cs
privacyidea · Jan 11, 2023 · 688888d · 688888d
1 parent 7eddfe9
commit 688888d
Show file tree

Hide file tree

Showing 8 changed files with 1,004 additions and 365 deletions.
diff --git a/PrivacyIDEA_Client/PIResponse.cs b/PrivacyIDEA_Client/PIResponse.cs
@@ -129,7 +129,15 @@ public List<string> WebAuthnSignRequests()
 
                 if (jobj["detail"] is JToken detail && detail.Type is not JTokenType.Null)
                 {
-                    if ((string?)detail["preferred_client_mode"] is string prefClientMode)
+                    if ((string?)detail["preferred_client_mode"] == "poll")
+                    {
+                        ret.PreferredClientMode = "push";
+                    }
+                    else if ((string?)detail["preferred_client_mode"] == "interactive")
+                    {
+                        ret.PreferredClientMode = "otp";
+                    }
+                    else if ((string?)detail["preferred_client_mode"] is string prefClientMode)
                     {
                         ret.PreferredClientMode = prefClientMode;
                     }

diff --git a/PrivacyIDEA_Client/PrivacyIDEA.cs b/PrivacyIDEA_Client/PrivacyIDEA.cs
@@ -12,28 +12,28 @@ public class PrivacyIDEA : IDisposable
         public string Realm { get; set; } = "";
         public Dictionary<string, string> RealmMap { get; set; } = new Dictionary<string, string>();
 
-        private bool _SSLVerify = true;
+        private bool _sslVerify = true;
         public bool SSLVerify
         {
             get
             {
-                return _SSLVerify;
+                return _sslVerify;
             }
             set
             {
-                if (SSLVerify != _SSLVerify)
+                if (value != _sslVerify)
                 {
                     _httpClientHandler = new HttpClientHandler();
-                    if (SSLVerify is false)
+                    if (value is false)
                     {
                         _httpClientHandler.ClientCertificateOptions = ClientCertificateOption.Manual;
                         _httpClientHandler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
                     }
                     _httpClient = new HttpClient(_httpClientHandler);
                     _httpClient.DefaultRequestHeaders.Add("User-Agent", _userAgent);
-                    _SSLVerify = SSLVerify;
+                    _sslVerify = value;
                 }
-            }
+            } 
         }
 
         private HttpClientHandler _httpClientHandler;
@@ -53,10 +53,10 @@ public bool SSLVerify
         private static readonly List<String> _logExcludedEndpoints = new(new string[]
            { "/auth", "/validate/polltransaction" });
 
-        public PrivacyIDEA(string url, string useragent, bool sslVerify = true)
+        public PrivacyIDEA(string url, string userAgent, bool sslVerify = true)
         {
             this.Url = url;
-            this._userAgent = useragent;
+            this._userAgent = userAgent;
 
             _httpClientHandler = new HttpClientHandler();
             if (sslVerify is false)
@@ -65,7 +65,7 @@ public PrivacyIDEA(string url, string useragent, bool sslVerify = true)
                 _httpClientHandler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
             }
             _httpClient = new HttpClient(_httpClientHandler);
-            _httpClient.DefaultRequestHeaders.Add("User-Agent", useragent);
+            _httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
         }
 
         /// <summary>
@@ -355,10 +355,7 @@ public void SetServiceAccount(string user, string pass, string realm = "")
         {
             _serviceUser = user;
             _servicePass = pass;
-            if (string.IsNullOrEmpty(realm) is false)
-            {
-                _serviceRealm = realm;
-            }
+            _serviceRealm = realm ?? "";
         }
 
         private Task<string> SendRequest(string endpoint, Dictionary<string, string> parameters, string method,

diff --git a/PrivacyIDEA_Client/PrivacyIDEA_Client.csproj b/PrivacyIDEA_Client/PrivacyIDEA_Client.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
 </Project>