Skip to content

Commit

Permalink
change cloud token to header instead of query (#921)
Browse files Browse the repository at this point in the history
  • Loading branch information
mike0sv authored Dec 26, 2023
1 parent fffa016 commit 1fba824
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
10 changes: 6 additions & 4 deletions src/evidently/ui/workspace/cloud.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from typing import Dict
from typing import Optional
from uuid import UUID

Expand All @@ -10,14 +11,16 @@
from evidently.ui.workspace.remote import RemoteMetadataStorage
from evidently.ui.workspace.view import WorkspaceView

TOKEN_HEADER_NAME = "X-Evidently-Token"


class CloudMetadataStorage(RemoteMetadataStorage):
token: str
cookie_name: str
_jwt_token: str = PrivateAttr(None)

def _get_jwt_token(self):
return super()._request("/api/users/login", "GET", query_params={"token": self.token}).text
return super()._request("/api/users/login", "GET", headers={TOKEN_HEADER_NAME: self.token}).text

@property
def jwt_token(self):
Expand All @@ -27,11 +30,11 @@ def jwt_token(self):
return self._jwt_token

def _request(self, path: str, method: str, query_params: Optional[dict] = None, body: Optional[dict] = None, response_model=None,
cookies=None):
cookies=None, headers: Dict[str, str] = None):
cookies = cookies or {}
cookies = cookies.copy()
cookies[self.cookie_name] = self.jwt_token
return super()._request(path, method, query_params, body, response_model, cookies=cookies)
return super()._request(path, method, query_params, body, response_model, cookies=cookies, headers=headers)


class CloudWorkspace(WorkspaceView):
Expand All @@ -41,7 +44,6 @@ class CloudWorkspace(WorkspaceView):

def __init__(self, token: str,
team_id: Optional[STR_UUID] = None, url: str = None):

self.token = token
self.url = url or self.URL

Expand Down
6 changes: 4 additions & 2 deletions src/evidently/ui/workspace/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import urllib.parse
import uuid
from json import JSONDecodeError
from typing import Dict
from typing import List
from typing import Optional
from typing import Set
Expand Down Expand Up @@ -49,10 +50,11 @@ def _request(
query_params: Optional[dict] = None,
body: Optional[dict] = None,
response_model=None,
cookies=None
cookies=None,
headers: Dict[str, str] = None
):
# todo: better encoding
headers = {}
headers = headers or {}
if self.secret is not None:
headers[SECRET_HEADER_NAME] = self.secret
data = None
Expand Down

0 comments on commit 1fba824

Please sign in to comment.