GML-1660 change authheader to token

tigergraph · Jun 11, 2024 · 089165b · 089165b
1 parent 5bc4f3e
commit 089165b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pyTigerGraph/pyTigerGraphBase.py b/pyTigerGraph/pyTigerGraphBase.py
@@ -223,7 +223,7 @@ def _verify_jwt_token_support(self):
             logger.debug("Attempting to verify JWT token support with getVer() on RestPP server.")
             logger.debug(f"Using auth header: {self.authHeader}") 
             version = self.getVer()
-            # logger.info(f"Database version: {version}")
+            logger.info(f"Database version: {version}")
 
             # Check JWT support for GSQL server
             logger.debug(f"Attempting to get auth info with URL: {self.gsUrl + '/gsqlserver/gsql/simpleauth'}")
@@ -315,6 +315,7 @@ def _req(self, method: str, url: str, authMode: str = "token", headers: dict = N
                 _headers = {'Authorization': "Bearer " + self.jwtToken}
             else:
                 _headers = {'Authorization': 'Basic {0}'.format(self.base64_credential)}
+
         if headers:
             _headers.update(headers)
         if self.awsIamHeaders:

diff --git a/tests/pyTigerGraphUnitTest.py b/tests/pyTigerGraphUnitTest.py
@@ -46,6 +46,6 @@ def make_connection(graphname: str = None):
         jwtToken=server_config["jwtToken"]
     )
     if server_config.get("getToken", False):
-        conn.getToken(conn.createSecret(), setToken=True)
+        conn.getToken(conn.createSecret())
 
     return conn
diff --git a/tests/test_jwtAuth.py b/tests/test_jwtAuth.py
@@ -63,9 +63,11 @@ def test_jwtauth(self):
         # self.conn.gsql("CREATE GRAPH tests()")
         # print (self.conn.graphname)
         # self.conn.gsql("USE GRAPH mygraph")
-        # self.conn.getToken(self.conn.createSecret())
+        token = self.conn.getToken(self.conn.createSecret())
 
-        authheader = self.conn.authHeader
+        # print (token)
+
+        authheader = {'Authorization': "Bearer " + token[0]}
         print (f"authheader from init conn: {authheader}")
         dbversion = self.conn.getVer()
         print (f"dbversion from init conn: {dbversion}")