Use AuraAPI credentials based session auth

Author: FlorentinD

graphdatascience/session/aura_api.py

@@ -44,8 +44,9 @@ def __init__(
         self, client_id: str, client_secret: str, tenant_id: Optional[str] = None, aura_env: Optional[str] = None
     ) -> None:
         self._base_uri = AuraApi.base_uri(aura_env)
+        self._credentials = (client_id, client_secret)
 
-        self._request_session = self._init_request_session((client_id, client_secret))
+        self._request_session = self._init_request_session(self._credentials)
         self._logger = logging.getLogger()
 
         self._tenant_id = tenant_id if tenant_id else self._get_tenant_id()

graphdatascience/session/dedicated_sessions.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import hashlib
 import math
+import uuid
 import warnings
 from datetime import datetime, timedelta, timezone
 from typing import Optional
@@ -74,10 +74,7 @@ def get_or_create(
 
         dbid = AuraApi.extract_id(db_connection.uri)
 
-        # hashing the password to avoid storing the actual db password in Aura
-        password = hashlib.sha256(db_connection.password.encode()).hexdigest()
-
-        session_details = self._get_or_create_session(session_name, dbid, password, memory.value, ttl, cloud_location)
+        session_details = self._get_or_create_session(session_name, dbid, memory.value, ttl, cloud_location)
 
         if session_details.expiry_date:
             until_expiry: timedelta = session_details.expiry_date - datetime.now(timezone.utc)
@@ -95,8 +92,8 @@ def get_or_create(
 
         session_connection = DbmsConnectionInfo(
             uri=connection_url,
-            username=DedicatedSessions.GDS_SESSION_USER,
-            password=password,
+            username=self._aura_api._credentials[0],
+            password=self._aura_api._credentials[1],
         )
 
         return self._construct_client(
@@ -154,7 +151,6 @@ def _get_or_create_session(
         self,
         session_name: str,
         dbid: str,
-        pwd: str,
         memory: SessionMemoryValue,
         ttl: Optional[timedelta] = None,
         cloud_location: Optional[CloudLocation] = None,
@@ -167,6 +163,8 @@ def _get_or_create_session(
         if cloud_location and db_instance:
             raise ValueError("cloud_location cannot be provided for sessions against an AuraDB.")
 
+        pwd = str(uuid.uuid4())  # password wont be used and will go away in v1 endpoints
+
         # If cloud location is provided we go for self managed DBs path
         if cloud_location:
             return self._aura_api.get_or_create_session(

graphdatascience/tests/unit/test_dedicated_sessions.py

@@ -227,9 +227,6 @@ def aura_api() -> AuraApi:
     return FakeAuraApi(client_id="client-id")
 
 
-HASHED_DB_PASSWORD = "722cbc618c015c7c062f071868d9bb5f207f35a317e71054740716642cfd0f61"
-
-
 def test_list_session(aura_api: AuraApi) -> None:
     _setup_db_instance(aura_api)
     session = aura_api.get_or_create_session(
@@ -354,7 +351,7 @@ def test_create_attached_session(mocker: MockerFixture, aura_api: AuraApi) -> No
             "show_progress": False,
         },
         "session_connection": DbmsConnectionInfo(
-            uri="neo4j+s://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
+            uri="neo4j+s://foo.bar", username="client-id", password="client_secret"
         ),
         "session_id": "ffff0-ffff1",
     }
@@ -392,7 +389,7 @@ def test_create_standalone_session(mocker: MockerFixture, aura_api: AuraApi) ->
             "show_progress": False,
         },
         "session_connection": DbmsConnectionInfo(
-            uri="neo4j+s://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
+            uri="neo4j+s://foo.bar", username="client-id", password="client_secret"
         ),
         "session_id": "None-ffff0",
     }
@@ -433,7 +430,7 @@ def test_get_or_create(mocker: MockerFixture, aura_api: AuraApi) -> None:
             "show_progress": False,
         },
         "session_connection": DbmsConnectionInfo(
-            uri="neo4j+s://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
+            uri="neo4j+s://foo.bar", username="client-id", password="client_secret"
         ),
         "session_id": "ffff0-ffff1",
     }