Skip to content

Commit 292ca9e

Browse files
authored
Flush before sending account deletion email (#19041)
* Flush before sending account deletion email * Update translations
1 parent 117eafc commit 292ca9e

File tree

2 files changed

+37
-34
lines changed

2 files changed

+37
-34
lines changed

warehouse/locale/messages.pot

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ msgstr ""
164164
msgid "Successful WebAuthn assertion"
165165
msgstr ""
166166

167-
#: warehouse/accounts/views.py:617 warehouse/manage/views/__init__.py:859
167+
#: warehouse/accounts/views.py:617 warehouse/manage/views/__init__.py:862
168168
msgid "Recovery code accepted. The supplied code cannot be used again."
169169
msgstr ""
170170

@@ -501,134 +501,134 @@ msgstr ""
501501
msgid "Email ${email_address} added - check your email for a verification link"
502502
msgstr ""
503503

504-
#: warehouse/manage/views/__init__.py:806
504+
#: warehouse/manage/views/__init__.py:809
505505
msgid "Recovery codes already generated"
506506
msgstr ""
507507

508-
#: warehouse/manage/views/__init__.py:808
508+
#: warehouse/manage/views/__init__.py:811
509509
msgid "Generating new recovery codes will invalidate your existing codes."
510510
msgstr ""
511511

512-
#: warehouse/manage/views/__init__.py:916
512+
#: warehouse/manage/views/__init__.py:919
513513
msgid "Verify your email to create an API token."
514514
msgstr ""
515515

516-
#: warehouse/manage/views/__init__.py:1018
516+
#: warehouse/manage/views/__init__.py:1021
517517
msgid "API Token does not exist."
518518
msgstr ""
519519

520-
#: warehouse/manage/views/__init__.py:1050
520+
#: warehouse/manage/views/__init__.py:1053
521521
msgid "Invalid credentials. Try again"
522522
msgstr ""
523523

524-
#: warehouse/manage/views/__init__.py:1169
524+
#: warehouse/manage/views/__init__.py:1172
525525
msgid "Invalid alternate repository location details"
526526
msgstr ""
527527

528-
#: warehouse/manage/views/__init__.py:1207
528+
#: warehouse/manage/views/__init__.py:1210
529529
#, python-brace-format
530530
msgid "Added alternate repository '${name}'"
531531
msgstr ""
532532

533-
#: warehouse/manage/views/__init__.py:1240
534-
#: warehouse/manage/views/__init__.py:1501
535-
#: warehouse/manage/views/__init__.py:1586
536-
#: warehouse/manage/views/__init__.py:1687
537-
#: warehouse/manage/views/__init__.py:1787
533+
#: warehouse/manage/views/__init__.py:1243
534+
#: warehouse/manage/views/__init__.py:1504
535+
#: warehouse/manage/views/__init__.py:1589
536+
#: warehouse/manage/views/__init__.py:1690
537+
#: warehouse/manage/views/__init__.py:1790
538538
msgid "Confirm the request"
539539
msgstr ""
540540

541-
#: warehouse/manage/views/__init__.py:1252
541+
#: warehouse/manage/views/__init__.py:1255
542542
msgid "Invalid alternate repository id"
543543
msgstr ""
544544

545-
#: warehouse/manage/views/__init__.py:1263
545+
#: warehouse/manage/views/__init__.py:1266
546546
msgid "Invalid alternate repository for project"
547547
msgstr ""
548548

549-
#: warehouse/manage/views/__init__.py:1272
549+
#: warehouse/manage/views/__init__.py:1275
550550
#, python-brace-format
551551
msgid ""
552552
"Could not delete alternate repository - ${confirm} is not the same as "
553553
"${alt_repo_name}"
554554
msgstr ""
555555

556-
#: warehouse/manage/views/__init__.py:1302
556+
#: warehouse/manage/views/__init__.py:1305
557557
#, python-brace-format
558558
msgid "Deleted alternate repository '${name}'"
559559
msgstr ""
560560

561-
#: warehouse/manage/views/__init__.py:1370
562-
#: warehouse/manage/views/__init__.py:1671
563-
#: warehouse/manage/views/__init__.py:1779
561+
#: warehouse/manage/views/__init__.py:1373
562+
#: warehouse/manage/views/__init__.py:1674
563+
#: warehouse/manage/views/__init__.py:1782
564564
msgid ""
565565
"Project deletion temporarily disabled. See https://pypi.org/help#admin-"
566566
"intervention for details."
567567
msgstr ""
568568

569-
#: warehouse/manage/views/__init__.py:1514
569+
#: warehouse/manage/views/__init__.py:1517
570570
msgid "Could not yank release - "
571571
msgstr ""
572572

573-
#: warehouse/manage/views/__init__.py:1599
573+
#: warehouse/manage/views/__init__.py:1602
574574
msgid "Could not un-yank release - "
575575
msgstr ""
576576

577-
#: warehouse/manage/views/__init__.py:1700
577+
#: warehouse/manage/views/__init__.py:1703
578578
msgid "Could not delete release - "
579579
msgstr ""
580580

581-
#: warehouse/manage/views/__init__.py:1799
581+
#: warehouse/manage/views/__init__.py:1802
582582
msgid "Could not find file"
583583
msgstr ""
584584

585-
#: warehouse/manage/views/__init__.py:1804
585+
#: warehouse/manage/views/__init__.py:1807
586586
msgid "Could not delete file - "
587587
msgstr ""
588588

589-
#: warehouse/manage/views/__init__.py:1954
589+
#: warehouse/manage/views/__init__.py:1957
590590
#, python-brace-format
591591
msgid "Team '${team_name}' already has ${role_name} role for project"
592592
msgstr ""
593593

594-
#: warehouse/manage/views/__init__.py:2061
594+
#: warehouse/manage/views/__init__.py:2064
595595
#, python-brace-format
596596
msgid "User '${username}' already has ${role_name} role for project"
597597
msgstr ""
598598

599-
#: warehouse/manage/views/__init__.py:2128
599+
#: warehouse/manage/views/__init__.py:2131
600600
#, python-brace-format
601601
msgid "${username} is now ${role} of the '${project_name}' project."
602602
msgstr ""
603603

604-
#: warehouse/manage/views/__init__.py:2160
604+
#: warehouse/manage/views/__init__.py:2163
605605
#, python-brace-format
606606
msgid ""
607607
"User '${username}' does not have a verified primary email address and "
608608
"cannot be added as a ${role_name} for project"
609609
msgstr ""
610610

611-
#: warehouse/manage/views/__init__.py:2173
611+
#: warehouse/manage/views/__init__.py:2176
612612
#: warehouse/manage/views/organizations.py:977
613613
#, python-brace-format
614614
msgid "User '${username}' already has an active invite. Please try again later."
615615
msgstr ""
616616

617-
#: warehouse/manage/views/__init__.py:2238
617+
#: warehouse/manage/views/__init__.py:2241
618618
#: warehouse/manage/views/organizations.py:1052
619619
#, python-brace-format
620620
msgid "Invitation sent to '${username}'"
621621
msgstr ""
622622

623-
#: warehouse/manage/views/__init__.py:2270
623+
#: warehouse/manage/views/__init__.py:2273
624624
msgid "Could not find role invitation."
625625
msgstr ""
626626

627-
#: warehouse/manage/views/__init__.py:2281
627+
#: warehouse/manage/views/__init__.py:2284
628628
msgid "Invitation already expired."
629629
msgstr ""
630630

631-
#: warehouse/manage/views/__init__.py:2314
631+
#: warehouse/manage/views/__init__.py:2317
632632
#: warehouse/manage/views/organizations.py:1239
633633
#, python-brace-format
634634
msgid "Invitation revoked from '${username}'."

warehouse/manage/views/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,9 @@ def delete_account(self):
478478
for journal in journals:
479479
journal.submitted_by = deleted_user
480480

481+
# Attempt to flush to identify any integrity errors before sending an email
482+
self.request.db.flush() # to identify any integrity errors
483+
481484
# Send a notification email
482485
send_account_deletion_email(self.request, self.request.user)
483486

0 commit comments

Comments
 (0)