From 7975e196790975055fd5be781c249030358cfdb6 Mon Sep 17 00:00:00 2001 From: "Christian R. Garcia" Date: Wed, 20 Nov 2024 23:53:32 -0800 Subject: [PATCH] derive tenant from host --- service/api_pods_podid_func.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/service/api_pods_podid_func.py b/service/api_pods_podid_func.py index 6a43174..1473468 100644 --- a/service/api_pods_podid_func.py +++ b/service/api_pods_podid_func.py @@ -354,6 +354,7 @@ async def pod_auth(pod_id_net, request: Request): # Get info for clients # The goal is: https://tacc.develop.tapis.io/v3/pods/{{pod_id}}/auth pod_id, tapis_domain = net_info['url'].split('.pods.') ## Should return `mypod` & `tacc.tapis.io` with proper tenant and schmu + tapis_tenant = tapis_domain.split('.')[0] if not net_info.get('tapis_auth', False): return JSONResponse(content = f"This pod does not have tapis_auth configured in networking for this pod_id_net: {pod_id_net}. Leave or remedy.", status_code = 403) @@ -369,7 +370,7 @@ async def pod_auth(pod_id_net, request: Request): oauth2_url = f"https://{tapis_domain}/v3/oauth2/authorize?client_id={client_id}&redirect_uri={auth_callback_url}&response_type=code" - return JSONResponse(content = f"tenant_id: {g.request_tenant_id}, beep: {t.base_url}", status_code = 302) + return JSONResponse(content = f"tenant_id: {g.request_tenant_id}, tenant: {tapis_tenant} beep: {t.base_url}", status_code = 302) # Create tapis client or update tapis client if needed try: @@ -379,7 +380,7 @@ async def pod_auth(pod_id_net, request: Request): callback_url = auth_callback_url, display_name = client_display_name, description = client_description, - _x_tapis_tenant = g.request_tenant_id, + _x_tapis_tenant = tapis_tenant, _x_tapis_user = "_tapis_pods", _tapis_debug = True ) @@ -393,7 +394,7 @@ async def pod_auth(pod_id_net, request: Request): callback_url = auth_callback_url, display_name = client_display_name, description = client_description, - _x_tapis_tenant = g.request_tenant_id, + _x_tapis_tenant = tapis_tenant, _x_tapis_user = "_tapis_pods", _tapis_debug = True )