Skip to content

Commit eb95b15

Browse files
soerenreichardtFlorentinD
authored andcommitted
Use JWT instead of credentials for session authentication
1 parent 1120b33 commit eb95b15

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

graphdatascience/session/aura_api.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,21 @@ def __init__(
6363
self._base_uri = AuraApi.base_uri(aura_env)
6464
self._credentials = (client_id, client_secret)
6565

66-
self._request_session = self._init_request_session(self._credentials)
66+
self._auth = AuraApi.Auth(
67+
oauth_url=f"{self._base_uri}/oauth/token",
68+
credentials=self._credentials,
69+
headers={"User-agent": f"neo4j-graphdatascience-v{__version__}"},
70+
)
71+
self._request_session = self._init_request_session()
6772
self._logger = logging.getLogger()
6873

6974
self._project_id = project_id if project_id else self._get_project_id()
7075
self._project_details: Optional[ProjectDetails] = None
7176

72-
def _init_request_session(self, credentials: tuple[str, str]) -> requests.Session:
77+
def _init_request_session(self) -> requests.Session:
7378
request_session = requests.Session()
7479
request_session.headers = {"User-agent": f"neo4j-graphdatascience-v{__version__}"}
75-
request_session.auth = AuraApi.Auth(
76-
oauth_url=f"{self._base_uri}/oauth/token", credentials=credentials, headers=request_session.headers
77-
)
80+
request_session.auth = self._auth
7881
# dont retry on POST as its not idempotent
7982
request_session.mount(
8083
"https://",

graphdatascience/session/dedicated_sessions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def get_or_create(
9090

9191
session_connection = DbmsConnectionInfo(
9292
uri=session_details.bolt_connection_url(),
93-
username=self._aura_api._credentials[0],
94-
password=self._aura_api._credentials[1],
93+
username="",
94+
password=self._aura_api._auth._auth_token(),
9595
)
9696

9797
return self._construct_client(

0 commit comments

Comments
 (0)