From 91f082eb69b908b883663ed6c03b201acf60333f Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Mon, 2 Aug 2021 10:25:06 +0100 Subject: [PATCH 1/2] fixed create_service from sending html and showing correctly on create --- .../templates/streamalerts/index.html | 1 + lnbits/extensions/streamalerts/views_api.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lnbits/extensions/streamalerts/templates/streamalerts/index.html b/lnbits/extensions/streamalerts/templates/streamalerts/index.html index 2349b941e..8386f008e 100644 --- a/lnbits/extensions/streamalerts/templates/streamalerts/index.html +++ b/lnbits/extensions/streamalerts/templates/streamalerts/index.html @@ -447,6 +447,7 @@ LNbits.api .request('POST', '/streamalerts/api/v1/services', wallet.inkey, data) .then(function (response) { + console.log(response) self.services.push(mapStreamAlerts(response.data)) self.serviceDialog.show = false self.serviceDialog.data = {} diff --git a/lnbits/extensions/streamalerts/views_api.py b/lnbits/extensions/streamalerts/views_api.py index 0ff707176..af45a2520 100644 --- a/lnbits/extensions/streamalerts/views_api.py +++ b/lnbits/extensions/streamalerts/views_api.py @@ -39,12 +39,17 @@ from ..satspay.crud import create_charge, get_charge ) async def api_create_service(): """Create a service, which holds data about how/where to post donations""" - service = await create_service(**g.data) - wallet = await get_wallet(service.wallet) - user = wallet.user - redirect_url = request.scheme + "://" + request.headers["Host"] - redirect_url += f"/streamalerts/?usr={user}&created={str(service.id)}" - return redirect(redirect_url) + try: + service = await create_service(**g.data) + except Exception as e: + return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR + # wallet = await get_wallet(service.wallet) + # user = wallet.user + # redirect_url = request.scheme + "://" + request.headers["Host"] + # redirect_url += f"/streamalerts/?usr={user}&created={str(service.id)}" + # return redirect(redirect_url) + return jsonify(service._asdict()), HTTPStatus.CREATED + @streamalerts_ext.route("/api/v1/getaccess/", methods=["GET"]) From e3764e384a8042fe639b9cf65196e1b41e0ff9f0 Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Mon, 2 Aug 2021 10:58:04 +0100 Subject: [PATCH 2/2] clean up comments and logs --- .../streamalerts/templates/streamalerts/index.html | 1 - lnbits/extensions/streamalerts/views_api.py | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lnbits/extensions/streamalerts/templates/streamalerts/index.html b/lnbits/extensions/streamalerts/templates/streamalerts/index.html index 8386f008e..2349b941e 100644 --- a/lnbits/extensions/streamalerts/templates/streamalerts/index.html +++ b/lnbits/extensions/streamalerts/templates/streamalerts/index.html @@ -447,7 +447,6 @@ LNbits.api .request('POST', '/streamalerts/api/v1/services', wallet.inkey, data) .then(function (response) { - console.log(response) self.services.push(mapStreamAlerts(response.data)) self.serviceDialog.show = false self.serviceDialog.data = {} diff --git a/lnbits/extensions/streamalerts/views_api.py b/lnbits/extensions/streamalerts/views_api.py index af45a2520..89f81dbe5 100644 --- a/lnbits/extensions/streamalerts/views_api.py +++ b/lnbits/extensions/streamalerts/views_api.py @@ -43,13 +43,9 @@ async def api_create_service(): service = await create_service(**g.data) except Exception as e: return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR - # wallet = await get_wallet(service.wallet) - # user = wallet.user - # redirect_url = request.scheme + "://" + request.headers["Host"] - # redirect_url += f"/streamalerts/?usr={user}&created={str(service.id)}" - # return redirect(redirect_url) - return jsonify(service._asdict()), HTTPStatus.CREATED + return jsonify(service._asdict()), HTTPStatus.CREATED + @streamalerts_ext.route("/api/v1/getaccess/", methods=["GET"])