Merge branch 'master' into test_pr_1083

snowflakedb · Jan 29, 2025 · 42cc358 · 42cc358
2 parents 6f291a9 + 4167b76
commit 42cc358
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Snowflake.Data/Core/Authenticator/ExternalBrowserAuthenticator.cs b/Snowflake.Data/Core/Authenticator/ExternalBrowserAuthenticator.cs
@@ -260,7 +260,7 @@ protected override void SetSpecializedAuthenticatorData(ref LoginRequestData dat
             // Add the token and proof key to the Data
             data.Token = _samlResponseToken;
             data.ProofKey = _proofKey;
-            SetSpecializedAuthenticatorData(ref data);
+            SetSecondaryAuthenticationData(ref data);
         }
 
         private string GetLoginUrl(string proofKey, int localPort)

diff --git a/Snowflake.Data/Core/Authenticator/KeyPairAuthenticator.cs b/Snowflake.Data/Core/Authenticator/KeyPairAuthenticator.cs
@@ -75,7 +75,7 @@ protected override void SetSpecializedAuthenticatorData(ref LoginRequestData dat
         {
             // Add the token to the Data attribute
             data.Token = jwtToken;
-            SetSpecializedAuthenticatorData(ref data);
+            SetSecondaryAuthenticationData(ref data);
         }
 
         /// <summary>

diff --git a/Snowflake.Data/Core/CredentialManager/Infrastructure/SFCredentialManagerWindowsNativeImpl.cs b/Snowflake.Data/Core/CredentialManager/Infrastructure/SFCredentialManagerWindowsNativeImpl.cs
@@ -110,6 +110,7 @@ public void SaveCredentials(string key, string token)
             }
         }
 
+        // note: the code below of dealing with Advapi32.dll library was inspired by: https://github.com/AdysTech/CredentialManager
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         private struct Credential
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,7 @@ public void SaveCredentials(string key, string token) @@
                 }
             }
+            // note: the code below of dealing with Advapi32.dll library was inspired by: https://github.com/AdysTech/CredentialManager
             [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
             private struct Credential
             {
@@ Expand Down @@