NowPayment crypto payments mostly works

python/payments/libpay.py

@@ -39,7 +39,7 @@ def config():
     return all_config
 
 
-def process_webhook(webhook_data, sent_data):
+def process_webhook(headers, webhook_data, sent_data):
     if "name" not in webhook_data:
         return False, "Webhook data has no 'name' property"
 
@@ -61,7 +61,7 @@ def process_webhook(webhook_data, sent_data):
     if (func := pay_handler.run(pay_module, "webhook")) is None:
         return False, f"Webhook for'{pay_module}' module is not set up"
 
-    ok, reply = func(webhook_data, sent_data, file_name)
+    ok, reply = func(headers, webhook_data, sent_data, file_name)
     if ok is None and reply is None:
         os.remove(file_name)
         return True, True

python/payments/plugins/paypal.py

@@ -23,14 +23,14 @@ def paypal_config():
         return None
 
     return_conf = {"desc": "Pay by PayPal"}
-    payapl_conf = pay_conf[THIS_MODULE]
-    paypal_mode = payapl_conf["mode"] if "mode" in payapl_conf else "live"
-    if paypal_mode == "test":
+    my_conf = pay_conf[THIS_MODULE]
+    my_mode = my_conf["mode"] if "mode" in my_conf else "live"
+    if my_mode == "test":
         return_conf["desc"] = "Pay by PayPal SandBox"
-    if paypal_mode in payapl_conf and "client_id" in payapl_conf[paypal_mode]:
-        return_conf["client_id"] = payapl_conf[paypal_mode]["client_id"]
-    elif "client_id" in payapl_conf:
-        return_conf["client_id"] = payapl_conf["client_id"]
+    if my_mode in my_conf and "client_id" in my_conf[my_mode]:
+        return_conf["client_id"] = my_conf[my_mode]["client_id"]
+    elif "client_id" in my_conf:
+        return_conf["client_id"] = my_conf["client_id"]
     else:
         return None
     return return_conf
@@ -41,15 +41,15 @@ def paypal_startup():
     if not isinstance(pay_conf, dict) or THIS_MODULE not in pay_conf:
         return None
 
-    payapl_conf = pay_conf[THIS_MODULE]
-    paypal_mode = payapl_conf["mode"] if "mode" in payapl_conf else "live"
+    my_conf = pay_conf[THIS_MODULE]
+    my_mode = my_conf["mode"] if "mode" in my_conf else "live"
 
-    if paypal_mode in payapl_conf and misc.has_data(payapl_conf[paypal_mode], ["webhook", "client_id"]):
-        mode_conf = payapl_conf[paypal_mode]
+    if my_mode in my_conf and misc.has_data(my_conf[my_mode], ["webhook", "client_id"]):
+        mode_conf = my_conf[my_mode]
         pay_handler.pay_webhooks[mode_conf["webhook"]] = {
             "name": THIS_MODULE,
             "client_id": mode_conf["client_id"],
-            "mode": paypal_mode
+            "mode": my_mode
         }
     return True
 
@@ -219,7 +219,7 @@ def process_webhook(self):
         return True, True
 
 
-def paypal_process_webhook(webhook_data, sent_data, filename):
+def paypal_process_webhook(headers, webhook_data, sent_data, filename):
     hook = PayPalWebHook(webhook_data, sent_data, filename)
     if not hook.interesting_webhook():
         return None, None

python/webui/run_webui.py

@@ -130,6 +130,7 @@ def before_request():
 
     allowable_referrer = policy.policy("allowable_referrer")
     if allowable_referrer is not None and isinstance(allowable_referrer, (dict, list)):
+        log(f"REFER={flask.request.referrer}")
         if flask.request.referrer in allowable_referrer:
             return None
     elif flask.request.referrer == policy.policy("website_name"):
@@ -171,7 +172,7 @@ def catch_webhook(webhook):
     elif flask.request.method == "GET":
         sent_data = flask.request.args
 
-    ok, reply = libpay.process_webhook(webhook_data, sent_data)
+    ok, reply = libpay.process_webhook(req.headers, webhook_data, sent_data)
     if not ok:
         return req.abort(reply)
     return req.response(reply)