From 6f7406fd4ba1f30a56f32e0caf40747e1bf7556f Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Sat, 4 Feb 2023 19:42:16 +0100 Subject: [PATCH] Fix user agent and referer not getting updated in requestor --- npbackup/upgrade_client/requestor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/npbackup/upgrade_client/requestor.py b/npbackup/upgrade_client/requestor.py index 781b200..119d1fe 100644 --- a/npbackup/upgrade_client/requestor.py +++ b/npbackup/upgrade_client/requestor.py @@ -92,6 +92,7 @@ class Requestor: def app_name(self, value: str): if isinstance(value, str): self._app_name = value.strip() + self.headers['Referer'] = self.app_name else: raise ValueError("Bogus app name") @@ -103,6 +104,7 @@ class Requestor: def user_agent(self, value: str): if isinstance(value, str): self._user_agent = value.strip() + self.headers['User-Agent'] = self.user_agent else: raise ValueError("Bogus user agent") @@ -414,8 +416,6 @@ class Requestor: if model: model = model.strip().strip("/") - if action == "create": - id_record = None if id_record: id_record = id_record.strip().strip("/") @@ -423,12 +423,14 @@ class Requestor: raise ValueError( "id may not start with [#] sign since it is reserved for pagination." ) - - if action != "create" and model and id_record: + if id_record: # Action is read, exists, update or delete model_endpoint = "{}/{}".format(model, id_record) else: model_endpoint = model + if data and isinstance(data, dict): + data = json.dumps(data) + result = self.requestor(model_endpoint, action, data, json_output) return result