Skip to content

Add passing refresh token for dashboard #8

Open
wants to merge 1 commit into
base: kryptonite-main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion desktop/libs/dashboard/src/dashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ def new_search(request):
engine = request.GET.get('engine', 'solr')
cluster = request.POST.get('cluster','""')

collections = get_engine(request.user, engine, cluster=cluster).datasets() if engine != 'report' else ['default']
spark_refresh_token = {'SPARK_REFRESH_TOKEN': request.session.get('oidc_refresh_token')}
collections = get_engine(request.user, engine, cluster=cluster).\
datasets(refresh_token=spark_refresh_token) if engine != 'report' else ['default']

if not collections:
if engine == 'solr':
Expand Down
14 changes: 12 additions & 2 deletions desktop/libs/notebook/src/notebook/dashboard_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

from notebook.models import make_notebook
from notebook.connectors.base import get_api, OperationTimeout, Notebook
from notebook.connectors.hiveserver2 import HS2Api

from dashboard.dashboard_api import DashboardApi
from dashboard.models import Collection2, augment_response
Expand Down Expand Up @@ -237,12 +238,21 @@ def fetch_result(self, dashboard, query, facet):


# This method currently behaves more like a static method
def datasets(self, show_all=False, database=None):
def datasets(self, show_all=False, database=None, refresh_token: dict = None):
snippet = {'type': self.engine}

# Ideally from left assist at some point instead
if database is None:
databases = get_api(MockRequest(self.user, self.cluster), snippet).autocomplete(snippet)['databases']
api = get_api(MockRequest(self.user, self.cluster), snippet)
if isinstance(api, HS2Api):
databases = api.autocomplete(snippet, refresh_token=refresh_token)['databases']
database = databases and 'default' not in databases and sorted(databases)[0] or 'default'
return [
database + '.' + table['name']
for table in api.autocomplete(snippet, database=database, refresh_token=refresh_token)['tables_meta']
]
else:
databases = api.autocomplete(snippet)['databases']
database = databases and 'default' not in databases and sorted(databases)[0] or 'default'

return [
Expand Down