🐛 Fixes listing in billing center (#5140)

Co-authored-by: Pedro Crespo-Valero <[email protected]>
Co-authored-by: Sylvain <[email protected]>

Author: 3 people

.env-devel

@@ -80,8 +80,8 @@ PAYMENTS_AUTORECHARGE_MIN_BALANCE_IN_CREDITS=100
 PAYMENTS_AUTORECHARGE_ENABLED=1
 PAYMENTS_FAKE_COMPLETION_DELAY_SEC=10
 PAYMENTS_FAKE_COMPLETION=0
-PAYMENTS_GATEWAY_API_SECRET=replace-with-api-secret
-PAYMENTS_GATEWAY_URL=https://fake-payment-gateway.com
+PAYMENTS_GATEWAY_API_SECRET=adminadmin
+PAYMENTS_GATEWAY_URL=http://127.0.0.1:32769
 PAYMENTS_HOST=payments
 PAYMENTS_LOGLEVEL=INFO
 PAYMENTS_PASSWORD=adminadmin

packages/models-library/src/models_library/api_schemas_payments/socketio.py

@@ -1,4 +1,4 @@
 from typing import Final
 
 SOCKET_IO_PAYMENT_COMPLETED_EVENT: Final[str] = "paymentCompleted"
-SOCKET_IO_PAYMENT_METHOD_ACKED_EVENT: Final[str] = "paymentMethodAcknoledged"
+SOCKET_IO_PAYMENT_METHOD_ACKED_EVENT: Final[str] = "paymentMethodAcknowledged"

packages/service-library/src/servicelib/fastapi/http_client.py

@@ -114,8 +114,16 @@ def to_curl_command(request: httpx.Request, *, use_short_options: bool = True) -
 
     # https://curl.se/docs/manpage.html#-H
     # H, --header <header/@file> Pass custom header(s) to server
+
     headers_option = ""
-    if headers := [f'"{k}: {v}"' for k, v in request.headers.items()]:
+    headers = []
+    for key, value in request.headers.items():
+        if "secret" in key.lower() or "pass" in key.lower():
+            headers.append(f'"{key}: *****"')
+        else:
+            headers.append(f'"{key}: {value}"')
+
+    if headers:
         _h = "-H" if use_short_options else "--header"
         headers_option = f"{_h} {f' {_h} '.join(headers)}"
 

packages/service-library/tests/fastapi/test_http_client.py

@@ -115,34 +115,42 @@ async def test_to_curl_command(mock_server_api: respx.MockRouter, base_url: str)
     mock_server_api.delete(path__startswith="/foo").respond(status.HTTP_200_OK)
 
     async with httpx.AsyncClient(base_url=base_url) as client:
-        response = await client.post("/foo", params={"x": "3"}, json={"y": 12})
+        response = await client.post(
+            "/foo",
+            params={"x": "3"},
+            json={"y": 12},
+            headers={"x-secret": "this should not display"},
+        )
         assert response.status_code == 200
 
-        cmd = to_curl_command(response.request)
+        cmd_short = to_curl_command(response.request)
 
         assert (
-            cmd
-            == 'curl -X POST -H "host: test_base_http_api" -H "accept: */*" -H "accept-encoding: gzip, deflate" -H "connection: keep-alive" -H "user-agent: python-httpx/0.25.0" -H "content-length: 9" -H "content-type: application/json" -d \'{"y": 12}\' https://test_base_http_api/foo?x=3'
+            cmd_short
+            == 'curl -X POST -H "host: test_base_http_api" -H "accept: */*" -H "accept-encoding: gzip, deflate" -H "connection: keep-alive" -H "user-agent: python-httpx/0.25.0" -H "x-secret: *****" -H "content-length: 9" -H "content-type: application/json" -d \'{"y": 12}\' https://test_base_http_api/foo?x=3'
         )
 
-        cmd = to_curl_command(response.request, use_short_options=False)
-        assert (
-            cmd
-            == 'curl --request POST --header "host: test_base_http_api" --header "accept: */*" --header "accept-encoding: gzip, deflate" --header "connection: keep-alive" --header "user-agent: python-httpx/0.25.0" --header "content-length: 9" --header "content-type: application/json" --data \'{"y": 12}\' https://test_base_http_api/foo?x=3'
+        cmd_long = to_curl_command(response.request, use_short_options=False)
+        assert cmd_long == cmd_short.replace("-X", "--request",).replace(
+            "-H",
+            "--header",
+        ).replace(
+            "-d",
+            "--data",
         )
 
         # with GET
         response = await client.get("/foo", params={"x": "3"})
-        cmd = to_curl_command(response.request)
+        cmd_long = to_curl_command(response.request)
 
         assert (
-            cmd
+            cmd_long
             == 'curl -X GET -H "host: test_base_http_api" -H "accept: */*" -H "accept-encoding: gzip, deflate" -H "connection: keep-alive" -H "user-agent: python-httpx/0.25.0"  https://test_base_http_api/foo?x=3'
         )
 
         # with DELETE
         response = await client.delete("/foo", params={"x": "3"})
-        cmd = to_curl_command(response.request)
+        cmd_long = to_curl_command(response.request)
 
-        assert "DELETE" in cmd
-        assert " -d " not in cmd
+        assert "DELETE" in cmd_long
+        assert " -d " not in cmd_long

services/payments/gateway/Makefile

@@ -5,3 +5,16 @@ include ../../../scripts/common.Makefile
 .PHONY: openapi.json
 openapi.json: ## creates OAS
 	example_payment_gateway.py openapi > $@
+
+.PHONY: up-local
+up-local:   ## starts payments-gateway sample for local testing
+	## Docs in http://127.0.0.1:32769/docs ...
+	source $(DOT_ENV_FILE) && export PAYMENTS_USERNAME PAYMENTS_PASSWORD && \
+	docker run -it \
+		-p 32769:8000 \
+		--env "PAYMENTS_SERVICE_API_BASE_URL=http://127.0.0.1:8011" \
+		--env "PAYMENTS_USERNAME=$$PAYMENTS_USERNAME" \
+		--env "PAYMENTS_PASSWORD=$$PAYMENTS_PASSWORD" \
+		--name "example_payment_gateway" \
+		local/payments:production \
+		example_payment_gateway.py run

services/payments/scripts/example_payment_gateway.py

@@ -450,7 +450,7 @@ def create_app():
 
 
 def run_command(args):
-    uvicorn.run(the_app, port=8080)
+    uvicorn.run(the_app, port=8000, host="0.0.0.0")  # nosec # NOSONAR
 
 
 def openapi_command(args):

services/payments/src/simcore_service_payments/_constants.py

@@ -1,6 +1,6 @@
 from typing import Final
 
-ACKED: Final[str] = "Acknoledged"
+ACKED: Final[str] = "Acknowledged"
 PAG: Final[str] = "Payments Gateway service"
 PGDB: Final[str] = "Postgres service"
 RUT: Final[str] = "Resource Usage Tracker service"

services/static-webserver/client/source/class/osparc/About.js

@@ -94,7 +94,7 @@ qx.Class.define("osparc.About", {
         contentPaddingLeft: 0,
         barPosition: "top"
       });
-      tabView.getChildControl("pane").setBackgroundColor("transparent_overlay");
+      tabView.getChildControl("pane").setBackgroundColor("transparent");
       this.add(tabView, {
         flex: 1
       });

services/static-webserver/client/source/class/osparc/desktop/credits/OneTimePayment.js

@@ -375,7 +375,7 @@ qx.Class.define("osparc.desktop.credits.OneTimePayment", {
 
     __popUpPaymentGateway: function(paymentId, url) {
       const options = {
-        width: 400,
+        width: 450,
         height: 600
       };
 
@@ -392,7 +392,7 @@ qx.Class.define("osparc.desktop.credits.OneTimePayment", {
 
     __popUpPaymentGatewayOld: function(paymentId, url) {
       const options = {
-        width: 400,
+        width: 450,
         height: 600,
         top: 100,
         left: 200,

services/static-webserver/client/source/class/osparc/desktop/paymentMethods/PaymentMethods.js

@@ -101,8 +101,14 @@ qx.Class.define("osparc.desktop.paymentMethods.PaymentMethods", {
         };
         osparc.data.Resources.fetch("paymentMethods", "init", params)
           .then(data => {
-            this.__popUpPaymentGateway(data["paymentMethodId"], data["paymentMethodFormUrl"]);
-            this.__fetchPaymentMethods();
+            const gatewayWindow = this.__popUpPaymentGateway(data.paymentMethodId, data.paymentMethodFormUrl);
+            osparc.wrapper.WebSocket.getInstance().getSocket().once("paymentMethodAcknoledged", wsData => {
+              const {paymentMethodId} = JSON.parse(wsData);
+              if (paymentMethodId === data.paymentMethodId) {
+                gatewayWindow.close();
+                this.__fetchPaymentMethods();
+              }
+            });
           });
       }
     },
@@ -127,7 +133,7 @@ qx.Class.define("osparc.desktop.paymentMethods.PaymentMethods", {
 
     __popUpPaymentGateway: function(paymentMethodId, url) {
       const options = {
-        width: 400,
+        width: 450,
         height: 600
       };
 
@@ -184,7 +190,7 @@ qx.Class.define("osparc.desktop.paymentMethods.PaymentMethods", {
         spacing: 3,
         height: 150,
         width: 150,
-        backgroundColor: "transparent_overlay"
+        backgroundColor: "transparent"
       });
 
       const paymentMethodsModel = this.__paymentMethodsModel = new qx.data.Array();
@@ -207,7 +213,6 @@ qx.Class.define("osparc.desktop.paymentMethods.PaymentMethods", {
         }
       });
 
-      paymentMethodsModel.removeAll();
       allPaymentMethods.forEach(paymentMethod => {
         const paymentMethodModel = qx.data.marshal.Json.createModel(paymentMethod);
         paymentMethodsModel.append(paymentMethodModel);