From bc96b296c4e1d6287aec9962b6db534db7bf8751 Mon Sep 17 00:00:00 2001 From: naman108 Date: Sun, 24 Mar 2024 16:46:43 -0300 Subject: [PATCH 1/3] fixed qr code generation --- .../rest_api_service/blueprints/user_management_blueprint.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FreeTAKServer/services/rest_api_service/blueprints/user_management_blueprint.py b/FreeTAKServer/services/rest_api_service/blueprints/user_management_blueprint.py index 19d5d623..1c0dbfbf 100644 --- a/FreeTAKServer/services/rest_api_service/blueprints/user_management_blueprint.py +++ b/FreeTAKServer/services/rest_api_service/blueprints/user_management_blueprint.py @@ -24,8 +24,9 @@ @page.route('/GenerateQR', methods=['GET']) def generate_qr(): - datapackage_id = request.args.get('datapackage_id') - dp = RestAPICommunicationController().make_request("GetEnterpriseSyncMetaData", "", {"id": datapackage_id}).get_value("objectmetadata") + datapackage_hash = request.args.get('datapackage_hash') + resp = RestAPICommunicationController().make_request("GetEnterpriseSyncMetaData", "", {"objecthash": datapackage_hash}) + dp = resp.get_value("objectmetadata") qr = qrcode.QRCode( version=1, box_size=10, From c611d418999a605e184af9ad42cb57c880897005 Mon Sep 17 00:00:00 2001 From: naman108 Date: Mon, 25 Mar 2024 21:35:31 -0300 Subject: [PATCH 2/3] reversing broken changes --- .../services/rest_api_service/rest_api_service_main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FreeTAKServer/services/rest_api_service/rest_api_service_main.py b/FreeTAKServer/services/rest_api_service/rest_api_service_main.py index e596f7ff..3f598997 100644 --- a/FreeTAKServer/services/rest_api_service/rest_api_service_main.py +++ b/FreeTAKServer/services/rest_api_service/rest_api_service_main.py @@ -1901,6 +1901,9 @@ def stop(self): def start(self, APIPipea, CommandPipea, IP, Port, starttime, factory): print('running api') + #ObjectFactory.configure(factory) + #tracing_provider = ObjectFactory.get_instance("TracingProvider") + #super().start(factory, tracing_provider) super().start() self.initialize_connections(APPLICATION_PROTOCOL) ObjectFactory.configure(factory) From e99e0e9e0a58eb2ec2fe197fae51f6e248b497a7 Mon Sep 17 00:00:00 2001 From: naman108 Date: Mon, 25 Mar 2024 21:36:47 -0300 Subject: [PATCH 3/3] minor version update --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e2771ffd..f3a723fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "FreeTAKServer" -version = "2.1.02" +version = "2.1.03" description = "An open source server for the TAK family of applications." authors = ["FreeTAKTeam "] readme = "README.md"