added manual test for idtoken and refactored

snowflakedb · Nov 21, 2023 · c101a4b · c101a4b
1 parent 2b4707a
commit c101a4b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/lib/connection/connection.js b/lib/connection/connection.js
@@ -312,8 +312,6 @@ function Connection(context)
 
     // Get authenticator to use
     const auth = Authenticator.getAuthenticator(connectionConfig, context.getHttpClient());
-    connectionConfig.auth = auth;
-    context.auth = auth;
 
     try
     {

diff --git a/lib/services/sf.js b/lib/services/sf.js
@@ -57,7 +57,7 @@ const GSErrors = require('../constants/gs_errors')
 const QueryContextCache = require('../queryContextCache');
 const Logger = require('../logger');
 const SecureStorage = require('../authentication/secureStorage');
-const {authenticationTypes} = require('../authentication/authentication');
+const {authenticationTypes, getAuthenticator} = require('../authentication/authentication');
 
 function isRetryableNetworkError(err)
 {
@@ -696,11 +696,12 @@ function StateAbstract(options)
             if (body && !body.success)
             {
               var data = body.data;
+              const auth = getAuthenticator(connectionConfig, httpClient);
 
               if(body.code === '390195' && data.authnMethod === 'TOKEN') {
                 Logger.getInstance().trace("ID Token being used has expired. Reauthenticating");
                 await SecureStorage.deleteCredential(connectionConfig.account, connectionConfig.username, authenticationTypes.ID_TOKEN_AUTHENTICATOR);
-                await connectionConfig.auth.reauthenticate(requestOptions.json);
+                await auth.reauthenticate(requestOptions.json);
                 httpClient.request(realRequestOptions);
                 return;
               }

diff --git a/test/integration/testManualConnection.js b/test/integration/testManualConnection.js
@@ -4,6 +4,7 @@ const assert = require("assert");
 const connOption = require("./connectionOptions");
 const testUtil = require("./testUtil");
 const Logger = require('../../lib/logger');
+const SecureStorage = require('../../lib/authentication/secureStorage');
 
 if (process.env.RUN_MANUAL_TESTS_ONLY == "true") {
   describe.only("Run manual tests", function () {
@@ -70,6 +71,38 @@ if (process.env.RUN_MANUAL_TESTS_ONLY == "true") {
           }
         });
       });
+
+      it("Connection - ID Token authenticator", async function (done) {
+
+        //Testing to obtain the id token.
+        await SecureStorage.deleteCredential(connectionOption.host, connectionOption.username, "ID_TOKEN");
+
+        const connectionOption = connOption.externalBrowser
+        const connection = snowflake.createConnection(
+          connectionOption
+        );
+        await connection.connectAsync(function (err) {
+          assert.ok(!err);
+          const idToken = SecureStorage.readCredential(connectionOption.host, connectionOption.username, "ID_TOKEN");
+          assert.ok( idToken !== null);
+        });
+        await testUtil.destroyConnectionAsync(connection);
+
+        //Testing  with the id token.
+        const idTokenConnection = snowflake.createConnection(connectionOption);
+        idTokenConnection.connectAsync(function (err) {
+          assert.ok(!err);
+        });
+        await testUtil.destroyConnectionAsync(idTokenConnection);
+
+        //Testing  with the id token.
+        await SecureStorage.writeCredential(connectionOption.host, connectionOption.username, "ID_TOKEN", "WRONG Token");
+        const wrongTokneConnection = testUtil.connectAsync(connOption);
+        await wrongTokneConnection.connectAsync(function (err) {
+          assert.ok(!err);
+          done();
+        });
+      })
     });
 
     describe("Connection test - oauth", function () {