Revert "PayPal: Migrate to Order v2 API and ISU authentication (#2493)"

This reverts commit 9af1565db1.

src/pretix/plugins/paypal/signals.py

@@ -24,27 +24,18 @@ from collections import OrderedDict
 
 from django import forms
 from django.dispatch import receiver
-from django.http import HttpRequest, HttpResponse
-from django.template.loader import get_template
-from django.urls import resolve
-from django.utils.crypto import get_random_string
 from django.utils.translation import gettext_lazy as _
 
-from pretix import settings
 from pretix.base.forms import SecretKeySettingsField
-from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp
-from pretix.base.settings import settings_hierarkey
 from pretix.base.signals import (
     logentry_display, register_global_settings, register_payment_providers,
 )
-from pretix.plugins.paypal.payment import PaypalMethod
-from pretix.presale.signals import html_head, process_response
 
 
 @receiver(register_payment_providers, dispatch_uid="payment_paypal")
 def register_payment_provider(sender, **kwargs):
-    from .payment import PaypalAPM, PaypalSettingsHolder, PaypalWallet
-    return [PaypalSettingsHolder, PaypalWallet, PaypalAPM]
+    from .payment import Paypal
+    return Paypal
 
 
 @receiver(signal=logentry_display, dispatch_uid="paypal_logentry_display")
@@ -61,7 +52,6 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs):
         'PAYMENT.SALE.REFUNDED': _('Payment refunded.'),
         'PAYMENT.SALE.REVERSED': _('Payment reversed.'),
         'PAYMENT.SALE.PENDING': _('Payment pending.'),
-        'CHECKOUT.ORDER.APPROVED': _('Order approved.'),
     }
 
     if event_type in plains:
@@ -77,20 +67,15 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs):
 def register_global_settings(sender, **kwargs):
     return OrderedDict([
         ('payment_paypal_connect_client_id', forms.CharField(
-            label=_('PayPal ISU/Connect: Client ID'),
+            label=_('PayPal Connect: Client ID'),
             required=False,
         )),
         ('payment_paypal_connect_secret_key', SecretKeySettingsField(
-            label=_('PayPal ISU/Connect: Secret key'),
-            required=False,
-        )),
-        ('payment_paypal_connect_partner_merchant_id', forms.CharField(
-            label=_('PayPal ISU/Connect: Partner Merchant ID'),
-            help_text=_('This is not the BN-code, but rather the ID of the merchant account which holds branding information for ISU.'),
+            label=_('PayPal Connect: Secret key'),
             required=False,
         )),
         ('payment_paypal_connect_endpoint', forms.ChoiceField(
-            label=_('PayPal ISU/Connect Endpoint'),
+            label=_('PayPal Connect Endpoint'),
             initial='live',
             choices=(
                 ('live', 'Live'),
@@ -98,73 +83,3 @@ def register_global_settings(sender, **kwargs):
             ),
         )),
     ])
-
-
-@receiver(html_head, dispatch_uid="payment_paypal_html_head")
-def html_head_presale(sender, request=None, **kwargs):
-    provider = PaypalMethod(sender)
-    url = resolve(request.path_info)
-
-    if provider.settings.get('_enabled', as_type=bool) and (
-            url.url_name == "event.order.pay.change" or
-            (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
-            (url.namespace == "plugins:paypal" and url.url_name == "pay")
-    ):
-        provider.init_api()
-        template = get_template('pretixplugins/paypal/presale_head.html')
-
-        ctx = {
-            'client_id': provider.client.environment.client_id,
-            'merchant_id': provider.client.environment.merchant_id,
-            'csp_nonce': _nonce(request),
-            'debug': settings.DEBUG,
-            'settings': provider.settings,
-            # If we ever have more APMs that can be disabled, we should iterate over the
-            # disable_method_*/enable_method*-keys
-            'disable_funding': 'sepa' if provider.settings.get('disable_method_sepa', as_type=bool) else '',
-            'enable_funding': 'paylater' if provider.settings.get('enable_method_paylater', as_type=bool) else ''
-        }
-
-        return template.render(ctx)
-    else:
-        return ""
-
-
-@receiver(signal=process_response, dispatch_uid="payment_paypal_middleware_resp")
-def signal_process_response(sender, request: HttpRequest, response: HttpResponse, **kwargs):
-    provider = PaypalMethod(sender)
-    url = resolve(request.path_info)
-
-    if provider.settings.get('_enabled', as_type=bool) and (
-            url.url_name == "event.order.pay.change" or
-            (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
-            (url.namespace == "plugins:paypal" and url.url_name == "pay")
-    ):
-        if 'Content-Security-Policy' in response:
-            h = _parse_csp(response['Content-Security-Policy'])
-        else:
-            h = {}
-
-        csps = {
-            'script-src': ['https://www.paypal.com', "'nonce-{}'".format(_nonce(request))],
-            'frame-src': ['https://www.paypal.com', 'https://www.sandbox.paypal.com', "'nonce-{}'".format(_nonce(request))],
-            'connect-src': ['https://www.paypal.com', 'https://www.sandbox.paypal.com'],  # Or not - seems to only affect PayPal logging...
-            'style-src': ["'nonce-{}'".format(_nonce(request))]
-        }
-
-        _merge_csp(h, csps)
-
-        if h:
-            response['Content-Security-Policy'] = _render_csp(h)
-
-    return response
-
-
-settings_hierarkey.add_default('payment_paypal_debug_buyer_country', '', str)
-settings_hierarkey.add_default('payment_paypal_method_wallet', True, bool)
-
-
-def _nonce(request):
-    if not hasattr(request, "_paypal_nonce"):
-        request._paypal_nonce = get_random_string(32)
-    return request._paypal_nonce