SNOW-1694143: Fix sso token authentication (#919) (Co-authored-by: su…

…permacro)
snowflakedb · Oct 1, 2024 · 852017f · 852017f
1 parent b624a8f
commit 852017f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -484,6 +484,16 @@ declare module 'snowflake-sdk' {
          */
         credentialCacheDir?: string;
 
+        /**
+         * The option to enable the MFA token. The default value is false.
+         */
+        clientRequestMFAToken?: boolean;
+
+        /**
+         * The option to enable the SSO token. The default value is false.
+         */
+        clientStoreTemporaryCredential?: boolean;
+
         /**
          *  The option to include the passcode from DUO into the password.
          */
@@ -492,7 +502,7 @@ declare module 'snowflake-sdk' {
         /**
          *  The option to pass passcode from DUO.
          */
-        passcode?: string
+        passcode?: string;
     }
 
     export interface Connection {

diff --git a/lib/connection/connection.js b/lib/connection/connection.js
@@ -305,7 +305,8 @@ function Connection(context) {
     }
 
     // Get authenticator to use
-    const auth = services.sf.getAuthenticator();
+    const auth = Authenticator.getAuthenticator(connectionConfig, context.getHttpClient());
+    services.sf.authenticator = auth;
 
     try {
       await initEasyLogging(connectionConfig.clientConfigFile);

diff --git a/lib/services/sf.js b/lib/services/sf.js
@@ -1185,12 +1185,11 @@ StateConnecting.prototype.continue = function () {
               numRetries,
             };
 
-            auth.reauthenticate(context.options.json, retryOption).then(() => {
-              numRetries = retryOption.numRetries;
-              totalElapsedTime = retryOption.totalElapsedTime;
-              setTimeout(sendRequest, sleep * 1000);
-              return;
-            });
+            await auth.reauthenticate(context.options.json, retryOption);
+            numRetries = retryOption.numRetries;
+            totalElapsedTime = retryOption.totalElapsedTime;
+            setTimeout(sendRequest, sleep * 1000);
+            return;
           } else {
             if (auth instanceof AuthKeypair) {
               Logger.getInstance().debug('AuthKeyPair authentication requires token refresh.');