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, 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) 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"