Update src/pretix/base/customersso/oidc.py

Co-authored-by: Mira <weller@rami.io>

pyproject.toml

@@ -81,7 +81,7 @@ dependencies = [
   "pycountry",
   "pycparser==2.22",
   "pycryptodome==3.21.*",
-  "pypdf==5.2.*",
+  "pypdf==5.1.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",

src/pretix/base/customersso/oidc.py

@@ -24,7 +24,7 @@ import hashlib
 import logging
 import time
 from datetime import datetime
-from urllib.parse import urlencode, urljoin
+from urllib.parse import parse_qsl, urlencode, urljoin
 
 import jwt
 import requests
@@ -139,6 +139,11 @@ def oidc_validate_and_complete_config(config):
                 )
             )
 
+    if "query_parameters" in config and config["query_parameters"]:
+        config["query_parameters"] = urlencode(
+            parse_qsl(config["query_parameters"])
+        )
+
     config['provider_config'] = provider_config
     return config
 
@@ -154,6 +159,10 @@ def oidc_authorize_url(provider, state, redirect_uri):
         'state': state,
         'redirect_uri': redirect_uri,
     }
+
+    if "query_parameters" in provider.configuration and provider.configuration["query_parameters"]:
+        params.update(parse_qsl(provider.configuration["query_parameters"]))
+
     return endpoint + '?' + urlencode(params)
 
 

src/pretix/control/forms/organizer.py

@@ -1043,6 +1043,15 @@ class SSOProviderForm(I18nModelForm):
         label=pgettext_lazy('sso_oidc', 'Phone field'),
         required=False,
     )
+    config_oidc_query_parameters = forms.CharField(
+        label=pgettext_lazy('sso_oidc', 'Query parameters'),
+        help_text=pgettext_lazy('sso_oidc', 'Optional query parameters, that will be added to calls to '
+                                            'the authorization endpoint. Enter as: {example}'.format(
+                                                example='<code>param1=value1&amp;param2=value2</code>'
+                                            ),
+                                ),
+        required=False,
+    )
 
     class Meta:
         model = CustomerSSOProvider

src/pretix/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-21 16:42+0000\n"
-"PO-Revision-Date: 2025-01-27 14:35+0000\n"
+"PO-Revision-Date: 2025-01-28 01:00+0000\n"
 "Last-Translator: Cornelius Kibelka <ckibelka-ctr@wikimedia.org>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.pretix.eu/projects/"
 "pretix/pretix/pt_BR/>\n"
@@ -2436,10 +2436,8 @@ msgid "Download a spreadsheet of all payments or refunds of every order."
 msgstr "Baixe uma planilha de todos os pagamentos e reembolsos de cada pedido."
 
 #: pretix/base/exporters/orderlist.py:1012
-#, fuzzy
-#| msgid "Date of last payment"
 msgid "Date range (payment date)"
-msgstr "Data do último pagamento"
+msgstr "Intervalo de datas (data de pagamento)"
 
 #: pretix/base/exporters/orderlist.py:1015
 msgid ""
@@ -2576,10 +2574,8 @@ msgid "Current user's carts"
 msgstr "Carrinhos de usuários atuais"
 
 #: pretix/base/exporters/orderlist.py:1135
-#, fuzzy
-#| msgid "Paid orders"
 msgid "Exited orders"
-msgstr "Ordens pagas"
+msgstr "Pedidos encerrados"
 
 #: pretix/base/exporters/orderlist.py:1135
 msgid "Current availability"
@@ -2593,18 +2589,14 @@ msgid "Infinite"
 msgstr "Infinito"
 
 #: pretix/base/exporters/orderlist.py:1181
-#, fuzzy
-#| msgid "Gift card"
 msgid "Gift card transactions"
-msgstr "Cartão Presente"
+msgstr "Transações com cartões-presente"
 
 #: pretix/base/exporters/orderlist.py:1183
 #: pretix/base/exporters/orderlist.py:1288
-#, fuzzy
-#| msgid "Gift card"
 msgctxt "export_category"
 msgid "Gift cards"
-msgstr "Cartão Presente"
+msgstr "Cartões-presente"
 
 #: pretix/base/exporters/orderlist.py:1184
 msgid "Download a spreadsheet of all gift card transactions."
@@ -2620,10 +2612,8 @@ msgstr ""
 #: pretix/control/templates/pretixcontrol/organizers/giftcard.html:28
 #: pretix/control/templates/pretixcontrol/organizers/giftcards.html:56
 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:156
-#, fuzzy
-#| msgid "Gift card"
 msgid "Gift card code"
-msgstr "Cartão Presente"
+msgstr "Código do cartão-presente"
 
 #: pretix/base/exporters/orderlist.py:1213
 #: pretix/base/exporters/orderlist.py:1302
@@ -2679,10 +2669,8 @@ msgid "TEST MODE"
 msgstr "MODO DE TESTE"
 
 #: pretix/base/exporters/orderlist.py:1240
-#, fuzzy
-#| msgid "Gift card"
 msgid "Gift card redemptions"
-msgstr "Cartão Presente"
+msgstr "Resgates de cartões-presente"
 
 #: pretix/base/exporters/orderlist.py:1242
 msgid ""
@@ -2700,10 +2688,8 @@ msgstr "Emissor"
 #: pretix/control/navigation.py:556
 #: pretix/control/templates/pretixcontrol/organizers/edit.html:156
 #: pretix/plugins/reports/accountingreport.py:898
-#, fuzzy
-#| msgid "Gift card"
 msgid "Gift cards"
-msgstr "Cartão Presente"
+msgstr "Cartões-presente"
 
 #: pretix/base/exporters/orderlist.py:1289
 msgid "Download a spreadsheet of all gift cards including their current value."
@@ -2797,17 +2783,12 @@ msgid "Created in order"
 msgstr "Criado em ordem"
 
 #: pretix/base/exporters/orderlist.py:1363
-#, fuzzy
-#| msgctxt "invoice"
-#| msgid "Invoice number"
 msgid "Last invoice number of order"
-msgstr "Número da fatura"
+msgstr "Último número de fatura do pedido"
 
 #: pretix/base/exporters/orderlist.py:1364
-#, fuzzy
-#| msgid "Only paid orders"
 msgid "Last invoice date of order"
-msgstr "Apenas ordens pagas"
+msgstr "Data da última fatura do pedido"
 
 #: pretix/base/exporters/reusablemedia.py:34 pretix/control/navigation.py:616
 #: pretix/control/templates/pretixcontrol/organizers/edit.html:204
@@ -2835,11 +2816,9 @@ msgid "Media type"
 msgstr "Tipo de mídia"
 
 #: pretix/base/exporters/reusablemedia.py:47 pretix/base/models/media.py:73
-#, fuzzy
-#| msgid "Internal identifier"
 msgctxt "reusable_medium"
 msgid "Identifier"
-msgstr "Identificador interno"
+msgstr "Identificador"
 
 #: pretix/base/exporters/reusablemedia.py:49 pretix/base/models/media.py:81
 #: pretix/base/models/orders.py:265 pretix/base/models/orders.py:3094
@@ -2851,27 +2830,18 @@ msgstr "Data de validade"
 #: pretix/base/exporters/reusablemedia.py:50 pretix/base/models/media.py:90
 #: pretix/control/templates/pretixcontrol/order/index.html:215
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html:132
-#, fuzzy
-#| msgctxt "refund_source"
-#| msgid "Customer"
 msgid "Customer account"
-msgstr "Cliente"
+msgstr "Conta do cliente"
 
 #: pretix/base/exporters/reusablemedia.py:51 pretix/base/models/media.py:97
-#, fuzzy
-#| msgid "Multiline text"
 msgid "Linked ticket"
-msgstr "Texto multilinha"
+msgstr "Bilhete vinculado"
 
 #: pretix/base/exporters/reusablemedia.py:52 pretix/base/models/media.py:104
-#, fuzzy
-#| msgid "Gift card"
 msgid "Linked gift card"
-msgstr "Cartão Presente"
+msgstr "Cartão-presente vinculado"
 
 #: pretix/base/exporters/waitinglist.py:42
-#, fuzzy
-#| msgid "Waiting list"
 msgctxt "export_category"
 msgid "Waiting list"
 msgstr "Lista de espera"
@@ -3566,23 +3536,23 @@ msgstr "Manter vazio"
 #: pretix/base/modelimport.py:139
 #, python-brace-format
 msgid "Invalid setting for column \"{header}\"."
-msgstr ""
+msgstr "Configuração inválida para a coluna “{header}”."
 
 #: pretix/base/modelimport.py:199
 #, python-brace-format
 msgid "Could not parse {value} as a yes/no value."
-msgstr ""
+msgstr "Não foi possível analisar {value} como um valor sim/não."
 
 #: pretix/base/modelimport.py:222
 #, python-brace-format
 msgid "Could not parse {value} as a date and time."
-msgstr ""
+msgstr "Não foi possível analisar {value} como uma data e hora."
 
 #: pretix/base/modelimport.py:232 pretix/control/views/orders.py:1162
 #: pretix/control/views/orders.py:1191 pretix/control/views/orders.py:1235
 #: pretix/control/views/orders.py:1270 pretix/control/views/orders.py:1293
 msgid "You entered an invalid number."
-msgstr ""
+msgstr "Você inseriu um número inválido."
 
 #: pretix/base/modelimport.py:279 pretix/base/modelimport.py:291
 #, fuzzy
@@ -3594,7 +3564,7 @@ msgstr "Nenhum evento arquivado encontrado."
 #: pretix/base/modelimport.py:281 pretix/base/modelimport.py:293
 msgctxt "subevent"
 msgid "Multiple matching dates were found."
-msgstr ""
+msgstr "Foram encontradas várias datas correspondentes."
 
 #: pretix/base/modelimport_orders.py:85
 #, fuzzy
@@ -3617,7 +3587,7 @@ msgstr "Nenhum evento arquivado encontrado."
 #: pretix/base/modelimport_orders.py:130
 #: pretix/base/modelimport_vouchers.py:196
 msgid "Multiple matching products were found."
-msgstr ""
+msgstr "Foram encontrados vários produtos correspondentes."
 
 #: pretix/base/modelimport_orders.py:139
 #: pretix/base/modelimport_vouchers.py:205 pretix/base/models/items.py:1245
@@ -3637,7 +3607,7 @@ msgstr "Informações da conta alteradas"
 #: pretix/base/modelimport_vouchers.py:227
 #: pretix/base/modelimport_vouchers.py:261
 msgid "Multiple matching variations were found."
-msgstr ""
+msgstr "Foram encontradas diversas variações correspondentes."
 
 #: pretix/base/modelimport_orders.py:164
 #, fuzzy
@@ -3726,7 +3696,7 @@ msgstr "Tipo de dispositivo"
 
 #: pretix/base/modelimport_orders.py:460
 msgid "You cannot assign a position secret that already exists."
-msgstr ""
+msgstr "Não é possível atribuir um segredo de posição que já exista."
 
 #: pretix/base/modelimport_orders.py:491
 #, fuzzy
@@ -3814,7 +3784,7 @@ msgstr "Um voucher com esse código já existe."
 #: pretix/base/models/vouchers.py:196 pretix/control/views/vouchers.py:120
 #: pretix/presale/templates/pretixpresale/organizers/customer_membership.html:52
 msgid "Maximum usages"
-msgstr ""
+msgstr "Usos máximos"
 
 #: pretix/base/modelimport_vouchers.py:79
 #, fuzzy
@@ -3840,20 +3810,22 @@ msgstr "Quantidade máxima por pedido"
 #: pretix/base/modelimport_vouchers.py:119 pretix/base/models/vouchers.py:225
 #: pretix/control/forms/filter.py:2106
 msgid "Reserve ticket from quota"
-msgstr ""
+msgstr "Reservar bilhete da cota"
 
 #: pretix/base/modelimport_vouchers.py:127 pretix/base/models/vouchers.py:233
 msgid "Allow to bypass quota"
-msgstr ""
+msgstr "Permitir ignorar a cota"
 
 #: pretix/base/modelimport_vouchers.py:135 pretix/base/models/vouchers.py:239
 msgid "Price mode"
-msgstr ""
+msgstr "Modo de preço"
 
 #: pretix/base/modelimport_vouchers.py:150
 #, python-brace-format
 msgid "Could not parse {value} as a price mode, use one of {options}."
 msgstr ""
+"Não foi possível analisar {value} como um modo de preço, use uma das "
+"{options}."
 
 #: pretix/base/modelimport_vouchers.py:160 pretix/base/models/vouchers.py:245
 msgid "Voucher value"
@@ -3861,18 +3833,18 @@ msgstr "Valor do voucher"
 
 #: pretix/base/modelimport_vouchers.py:165
 msgid "It is pointless to set a value without a price mode."
-msgstr ""
+msgstr "Não faz sentido definir um valor sem um modo de preço."
 
 #: pretix/base/modelimport_vouchers.py:237 pretix/base/models/items.py:2081
 #: pretix/base/models/vouchers.py:272
 #: pretix/control/templates/pretixcontrol/items/quota_edit.html:8
 #: pretix/control/templates/pretixcontrol/items/quota_edit.html:15
 msgid "Quota"
-msgstr ""
+msgstr "Cota"
 
 #: pretix/base/modelimport_vouchers.py:253
 msgid "You cannot specify a quota if you specified a product."
-msgstr ""
+msgstr "Não é possível especificar uma cota se você especificou um produto."
 
 #: pretix/base/modelimport_vouchers.py:282 pretix/base/models/vouchers.py:495
 #, fuzzy
@@ -3895,11 +3867,9 @@ msgid "Seat-specific vouchers can only be used once."
 msgstr "Este produto não será vendido após a data indicada."
 
 #: pretix/base/modelimport_vouchers.py:306 pretix/base/models/vouchers.py:519
-#, fuzzy, python-brace-format
-#| msgctxt "subevent"
-#| msgid "You need to select a date."
+#, python-brace-format
 msgid "You need to choose the product \"{prod}\" for this seat."
-msgstr "Você precisa selecionar uma data."
+msgstr "Você precisa escolher o produto “{prod}” para esse assento."
 
 #: pretix/base/modelimport_vouchers.py:318 pretix/base/models/vouchers.py:285
 #: pretix/control/templates/pretixcontrol/vouchers/index.html:129
@@ -3910,17 +3880,20 @@ msgstr "Tag"
 
 #: pretix/base/modelimport_vouchers.py:334 pretix/base/models/vouchers.py:297
 msgid "Shows hidden products that match this voucher"
-msgstr ""
+msgstr "Mostra produtos ocultos que correspondem a esse voucher"
 
 #: pretix/base/modelimport_vouchers.py:343 pretix/base/models/vouchers.py:301
 msgid "Offer all add-on products for free when redeeming this voucher"
 msgstr ""
+"Ofereça todos os produtos adicionais gratuitamente ao resgatar este voucher"
 
 #: pretix/base/modelimport_vouchers.py:351 pretix/base/models/vouchers.py:305
 msgid ""
 "Include all bundled products without a designated price when redeeming this "
 "voucher"
 msgstr ""
+"Inclua todos os produtos incluídos em um pacote sem um preço designado ao "
+"resgatar esse voucher"
 
 #: pretix/base/models/auth.py:248
 msgid "Is active"
@@ -3994,22 +3967,28 @@ msgid ""
 "and valid for check-in regardless of which date they are purchased for. You "
 "can limit their validity through the advanced check-in rules, though."
 msgstr ""
+"Se você escolher “todas as datas”, os bilhetes serão considerados parte "
+"dessa lista e válidos para o check-in, independentemente da data para a qual "
+"foram comprados. No entanto, você pode limitar a validade deles por meio das "
+"regras avançadas de check-in."
 
 #: pretix/base/models/checkin.py:65
 msgctxt "checkin"
 msgid "Ignore check-ins on this list in statistics"
-msgstr ""
+msgstr "Ignorar os check-ins dessa lista nas estatísticas"
 
 #: pretix/base/models/checkin.py:69
 msgctxt "checkin"
 msgid "Tickets with a check-in on this list should be considered \"used\""
-msgstr ""
+msgstr "Os bilhetes com um check-in nessa lista devem ser considerados “usados”"
 
 #: pretix/base/models/checkin.py:70
 msgid ""
 "This is relevant in various situations, e.g. for deciding if a ticket can "
 "still be canceled by the customer."
 msgstr ""
+"Isso é relevante em várias situações, por exemplo, para decidir se um "
+"bilhete ainda pode ser cancelado pelo cliente."
 
 #: pretix/base/models/checkin.py:74
 msgctxt "checkin"
@@ -4033,6 +4012,8 @@ msgstr ""
 #: pretix/base/models/checkin.py:79
 msgid "Allow checking in add-on tickets by scanning the main ticket"
 msgstr ""
+"Permitir o check-in de bilhetes adicionais por meio da leitura do bilhete "
+"principal"
 
 #: pretix/base/models/checkin.py:81
 msgid ""
@@ -4040,6 +4021,9 @@ msgid ""
 "there is always exactly one matching add-on ticket. Ambiguous scans will be "
 "rejected.."
 msgstr ""
+"Um escaneamento só será possível se a lista de check-in estiver configurada "
+"de forma que sempre haja exatamente um bilhete complementar correspondente. "
+"Os escaneamentos ambíguos serão rejeitados..."
 
 #: pretix/base/models/checkin.py:85 pretix/control/navigation.py:640
 #: pretix/control/templates/pretixcontrol/organizers/gates.html:5
@@ -4054,19 +4038,23 @@ msgid ""
 "Does not have any effect for the validation of tickets, only for the "
 "automatic configuration of check-in devices."
 msgstr ""
+"Não tem efeito na validação de bilhetes, apenas na configuração automática "
+"dos dispositivos de check-in."
 
 #: pretix/base/models/checkin.py:90
 msgid "Allow re-entering after an exit scan"
-msgstr ""
+msgstr "Permitir o reingresso após um escaneamento de saída"
 
 #: pretix/base/models/checkin.py:94
 msgid "Allow multiple entries per ticket"
-msgstr ""
+msgstr "Permitir várias entradas por bilhete"
 
 #: pretix/base/models/checkin.py:95
 msgid ""
 "Use this option to turn off warnings if a ticket is scanned a second time."
 msgstr ""
+"Use essa opção para desativar os avisos se um bilhete for escaneado uma "
+"segunda vez."
 
 #: pretix/base/models/checkin.py:99
 #, fuzzy
@@ -4082,7 +4070,7 @@ msgstr "País"
 
 #: pretix/base/models/checkin.py:337
 msgid "Exit"
-msgstr ""
+msgstr "Saída"
 
 #: pretix/base/models/checkin.py:355
 #, fuzzy

src/pretix/static/pretixpresale/js/widget/widget.js

@@ -230,7 +230,7 @@ Vue.component('availbox', {
         + '       v-bind:aria-label="label_select_item"'
         + '>'
         + '</label>'
-        + '<div :class="count_group_classes" v-else>'
+        + '<div :class="count_group_classes" v-else role="group" v-bind:aria-label="item.name">'
         + '<button v-if="!$root.use_native_spinners" type="button" @click.prevent.stop="on_step" data-step="-1" v-bind:data-controls="\'input_\' + input_name" class="pretix-widget-btn-default pretix-widget-item-count-dec" aria-label="' + strings.quantity_dec + '"><span>-</span></button>'
         + '<input type="number" inputmode="numeric" pattern="\d*" class="pretix-widget-item-count-multiple" placeholder="0" min="0"'
         + '       v-model="amount_selected" :max="order_max" :name="input_name" :id="\'input_\' + input_name"'
@@ -723,7 +723,6 @@ var shared_methods = {
     },
     buy_callback: function (data) {
         if (data.redirect) {
-            var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
             if (data.cart_id) {
                 this.$root.cart_id = data.cart_id;
                 setCookie(this.$root.cookieName, data.cart_id, 30);
@@ -748,7 +747,7 @@ var shared_methods = {
                 }
                 this.$root.overlay.frame_loading = false;
             } else {
-                iframe.src = url;
+                this.$root.overlay.frame_src = url;
             }
         } else {
             this.async_task_id = data.async_id;
@@ -787,9 +786,7 @@ var shared_methods = {
         if (this.$root.additionalURLParams) {
             redirect_url += '&' + this.$root.additionalURLParams;
         }
-        var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
-        this.$root.overlay.frame_loading = true;
-        iframe.src = redirect_url;
+        this.$root.overlay.frame_src = redirect_url;
     },
     voucher_open: function (voucher) {
         var redirect_url;
@@ -801,9 +798,7 @@ var shared_methods = {
             redirect_url += '&' + this.$root.additionalURLParams;
         }
         if (this.$root.useIframe) {
-            var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
-            this.$root.overlay.frame_loading = true;
-            iframe.src = redirect_url;
+            this.$root.overlay.frame_src = redirect_url;
         } else {
             window.open(redirect_url);
         }
@@ -826,9 +821,7 @@ var shared_methods = {
             redirect_url += '&' + this.$root.additionalURLParams;
         }
         if (this.$root.useIframe) {
-            var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
-            this.$root.overlay.frame_loading = true;
-            iframe.src = redirect_url;
+            this.$root.overlay.frame_src = redirect_url;
         } else {
             window.open(redirect_url);
         }
@@ -853,27 +846,27 @@ var shared_loading_fragment = (
 );
 
 var shared_iframe_fragment = (
-    '<div :class="frameClasses">'
+    '<div :class="frameClasses" role="dialog" aria-modal="true" >'
     + '<div class="pretix-widget-frame-loading" v-show="$root.frame_loading">'
     + '<svg width="256" height="256" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path class="pretix-widget-primary-color" d="M1152 896q0-106-75-181t-181-75-181 75-75 181 75 181 181 75 181-75 75-181zm512-109v222q0 12-8 23t-20 13l-185 28q-19 54-39 91 35 50 107 138 10 12 10 25t-9 23q-27 37-99 108t-94 71q-12 0-26-9l-138-108q-44 23-91 38-16 136-29 186-7 28-36 28h-222q-14 0-24.5-8.5t-11.5-21.5l-28-184q-49-16-90-37l-141 107q-10 9-25 9-14 0-25-11-126-114-165-168-7-10-7-23 0-12 8-23 15-21 51-66.5t54-70.5q-27-50-41-99l-183-27q-13-2-21-12.5t-8-23.5v-222q0-12 8-23t19-13l186-28q14-46 39-92-40-57-107-138-10-12-10-24 0-10 9-23 26-36 98.5-107.5t94.5-71.5q13 0 26 10l138 107q44-23 91-38 16-136 29-186 7-28 36-28h222q14 0 24.5 8.5t11.5 21.5l28 184q49 16 90 37l142-107q9-9 24-9 13 0 25 10 129 119 165 170 7 8 7 22 0 12-8 23-15 21-51 66.5t-54 70.5q26 50 41 98l183 28q13 2 21 12.5t8 23.5z"/></svg>'
     + '</div>'
     + '<div class="pretix-widget-frame-inner" ref="frame-container" v-show="$root.frame_shown">'
+    + '<div class="pretix-widget-frame-close"><a href="#" @click.prevent.stop="close" role="button" aria-label="'+strings.close+'">'
+    + '<svg height="16" viewBox="0 0 512 512" width="16" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M437.5,386.6L306.9,256l130.6-130.6c14.1-14.1,14.1-36.8,0-50.9c-14.1-14.1-36.8-14.1-50.9,0L256,205.1L125.4,74.5  c-14.1-14.1-36.8-14.1-50.9,0c-14.1,14.1-14.1,36.8,0,50.9L205.1,256L74.5,386.6c-14.1,14.1-14.1,36.8,0,50.9  c14.1,14.1,36.8,14.1,50.9,0L256,306.9l130.6,130.6c14.1,14.1,36.8,14.1,50.9,0C451.5,423.4,451.5,400.6,437.5,386.6z"/></svg>'
+    + '</a></div>'
     + '<iframe frameborder="0" width="650" height="650" @load="iframeLoaded" '
     + '        :name="$root.parent.widget_id" src="about:blank" v-once'
     + '        allow="autoplay *; camera *; fullscreen *; payment *"'
     + '        referrerpolicy="origin">'
     + 'Please enable frames in your browser!'
     + '</iframe>'
-    + '<div class="pretix-widget-frame-close"><a href="#" @click.prevent.stop="close" role="button" aria-label="'+strings.close+'">'
-    + '<svg height="16" viewBox="0 0 512 512" width="16" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M437.5,386.6L306.9,256l130.6-130.6c14.1-14.1,14.1-36.8,0-50.9c-14.1-14.1-36.8-14.1-50.9,0L256,205.1L125.4,74.5  c-14.1-14.1-36.8-14.1-50.9,0c-14.1,14.1-14.1,36.8,0,50.9L205.1,256L74.5,386.6c-14.1,14.1-14.1,36.8,0,50.9  c14.1,14.1,36.8,14.1,50.9,0L256,306.9l130.6,130.6c14.1,14.1,36.8,14.1,50.9,0C451.5,423.4,451.5,400.6,437.5,386.6z"/></svg>'
-    + '</a></div>'
     + '</div>'
     + '</div>'
 );
 
 var shared_alert_fragment = (
-    '<div :class="alertClasses">'
-    + '<transition name="bounce">'
+    '<div :class="alertClasses" role="dialog" aria-modal="true" aria-live="polite">'
+    + '<transition name="bounce" @after-enter="focusButton">'
     + '<div class="pretix-widget-alert-box" v-if="$root.error_message">'
     + '<p>{{ $root.error_message }}</p>'
     + '<p><button v-if="$root.error_url_after" @click.prevent.stop="errorContinue">' + strings.continue + '</button>'
@@ -966,8 +959,7 @@ Vue.component('pretix-overlay', {
                 window.open(this.$root.error_url_after);
                 return;
             }
-            var iframe = this.$refs['frame-container'].children[0];
-            iframe.src = this.$root.error_url_after;
+            this.$root.overlay.frame_src = this.$root.error_url_after;
             this.$root.frame_loading = true;
             this.$root.error_message = null;
             this.$root.error_url_after = null;
@@ -975,15 +967,22 @@ Vue.component('pretix-overlay', {
         close: function () {
             this.$root.frame_shown = false;
             this.$root.parent.frame_dismissed = true;
+            this.$root.frame_src = "";
             this.$root.parent.reload();
             this.$root.parent.trigger_close_callback();
         },
         iframeLoaded: function () {
             if (this.$root.frame_loading) {
                 this.$root.frame_loading = false;
-                this.$root.frame_shown = true;
+                if (this.$root.frame_src) {
+                    this.$root.frame_shown = true;
+                }
             }
-        }
+        },
+        focusButton: function () {
+            this.$el.querySelector(".pretix-widget-alert-box button").focus();
+        },
+
     }
 });
 
@@ -1738,8 +1737,7 @@ var shared_root_methods = {
             } else {
                 url += '?iframe=1';
             }
-            this.$root.overlay.$children[0].$refs['frame-container'].children[0].src = url;
-            this.$root.overlay.frame_loading = true;
+            this.$root.overlay.frame_src = url;
         } else {
             event.target.href = url;
             return;
@@ -1902,9 +1900,7 @@ var shared_root_methods = {
             redirect_url += '&' + this.$root.additionalURLParams;
         }
         if (this.$root.useIframe) {
-            var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
-            this.$root.overlay.frame_loading = true;
-            iframe.src = redirect_url;
+            this.$root.overlay.frame_src = redirect_url;
         } else {
             window.open(redirect_url);
         }
@@ -1928,9 +1924,7 @@ var shared_root_methods = {
             redirect_url += '&' + this.$root.additionalURLParams;
         }
         if (this.$root.useIframe) {
-            var iframe = this.$root.overlay.$children[0].$refs['frame-container'].children[0];
-            this.$root.overlay.frame_loading = true;
-            iframe.src = redirect_url;
+            this.$root.overlay.frame_src = redirect_url;
         } else {
             window.open(redirect_url);
         }
@@ -2067,9 +2061,41 @@ var create_overlay = function (app) {
                 error_url_after_new_tab: true,
                 error_message: null,
                 lightbox: null,
+                prevActiveElement: null,
             }
         },
+        props: {
+            frame_src: String,
+        },
         methods: {
+        },
+        watch: {
+            frame_src: function (newValue, oldValue) {
+                // show loading spinner only when previously no frame_src was set
+                if (newValue && !oldValue) {
+                    this.frame_loading = true;
+                }
+                // to close and unload the iframe, frame_src can be empty -> make it valid HTML with about:blank
+                this.$el.querySelector("iframe").src = newValue || "about:blank";
+            },
+            frame_shown: function (newValue) {
+                if (newValue) {
+                    this.prevActiveElement = document.activeElement;
+                    var btn = this.$el?.querySelector(".pretix-widget-frame-close a");
+                    this.$nextTick(function () {
+                        btn?.focus();
+                    });
+                } else {
+                    this.prevActiveElement?.focus();
+                }
+            },
+            error_message: function (newValue) {
+                if (newValue) {
+                    this.prevActiveElement = document.activeElement;
+                } else {
+                    this.prevActiveElement?.focus();
+                }
+            },
         }
     });
     app.$root.overlay = framechild;