From 395dc1d8a84feb8394b27ee786a1b034e199fb4c Mon Sep 17 00:00:00 2001 From: Fellipe Henrique <2904206+fellipeh@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:57:01 -0300 Subject: [PATCH] fix(RHINENG-6185) Return current org_id (#1583) GET `default` endpoint now returns current org_id Signed-off-by: Fellipe Henrique <2904206+fellipeh@users.noreply.github.com> --- api/staleness.py | 5 +++-- api/staleness_query.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/staleness.py b/api/staleness.py index 08913ff7f..ef8961c50 100644 --- a/api/staleness.py +++ b/api/staleness.py @@ -10,7 +10,7 @@ from api import json_error_response from api import metrics from api.staleness_query import get_staleness_obj -from api.staleness_query import get_sys_default_staleness +from api.staleness_query import get_sys_default_staleness_api from app import RbacPermission from app import RbacResourceType from app.auth import get_current_identity @@ -65,7 +65,8 @@ def get_staleness(rbac_filter=None): @metrics.api_request_time.time() def get_default_staleness(rbac_filter=None): try: - staleness = get_sys_default_staleness() + identity = get_current_identity() + staleness = get_sys_default_staleness_api(identity) staleness = serialize_staleness_response(staleness) return flask_json_response(staleness, status.HTTP_200_OK) diff --git a/api/staleness_query.py b/api/staleness_query.py index 80f561450..266c5367a 100644 --- a/api/staleness_query.py +++ b/api/staleness_query.py @@ -30,6 +30,11 @@ def get_sys_default_staleness(config=None): return _build_staleness_sys_default("000000", config) +def get_sys_default_staleness_api(identity, config=None): + org_id = identity.org_id or "00000" + return _build_staleness_sys_default(org_id, config) + + def _build_staleness_sys_default(org_id, config=None): if not config: config = inventory_config()