Skip to content

Commit

Permalink
Use explicit formdata for ConfirmPasswordForm (pypi#13914)
Browse files Browse the repository at this point in the history
* Use explicit formdata for ConfirmPasswordForm

* Update translations
  • Loading branch information
di authored Jun 12, 2023
1 parent 3ed02ec commit d9c18a0
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 33 deletions.
62 changes: 31 additions & 31 deletions warehouse/locale/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ msgstr ""
msgid "Successful WebAuthn assertion"
msgstr ""

#: warehouse/accounts/views.py:499 warehouse/manage/views/__init__.py:820
#: warehouse/accounts/views.py:499 warehouse/manage/views/__init__.py:824
msgid "Recovery code accepted. The supplied code cannot be used again."
msgstr ""

Expand Down Expand Up @@ -267,13 +267,13 @@ msgid "You are now ${role} of the '${project_name}' project."
msgstr ""

#: warehouse/accounts/views.py:1434 warehouse/accounts/views.py:1582
#: warehouse/manage/views/__init__.py:1223
#: warehouse/manage/views/__init__.py:1227
msgid ""
"Trusted publishing is temporarily disabled. See https://pypi.org/help"
"#admin-intervention for details."
msgstr ""

#: warehouse/accounts/views.py:1451 warehouse/manage/views/__init__.py:1239
#: warehouse/accounts/views.py:1451 warehouse/manage/views/__init__.py:1243
msgid ""
"GitHub-based trusted publishing is temporarily disabled. See "
"https://pypi.org/help#admin-intervention for details."
Expand All @@ -289,13 +289,13 @@ msgstr ""
msgid "You can't register more than 3 pending trusted publishers at once."
msgstr ""

#: warehouse/accounts/views.py:1494 warehouse/manage/views/__init__.py:1258
#: warehouse/accounts/views.py:1494 warehouse/manage/views/__init__.py:1262
msgid ""
"There have been too many attempted trusted publisher registrations. Try "
"again later."
msgstr ""

#: warehouse/accounts/views.py:1508 warehouse/manage/views/__init__.py:1272
#: warehouse/accounts/views.py:1508 warehouse/manage/views/__init__.py:1276
msgid "The trusted publisher could not be registered"
msgstr ""

Expand Down Expand Up @@ -412,98 +412,98 @@ msgstr ""
msgid "Email ${email_address} added - check your email for a verification link"
msgstr ""

#: warehouse/manage/views/__init__.py:768
#: warehouse/manage/views/__init__.py:772
msgid "Recovery codes already generated"
msgstr ""

#: warehouse/manage/views/__init__.py:769
#: warehouse/manage/views/__init__.py:773
msgid "Generating new recovery codes will invalidate your existing codes."
msgstr ""

#: warehouse/manage/views/__init__.py:875
#: warehouse/manage/views/__init__.py:879
msgid "Verify your email to create an API token."
msgstr ""

#: warehouse/manage/views/__init__.py:1000
#: warehouse/manage/views/__init__.py:1004
msgid "Invalid credentials. Try again"
msgstr ""

#: warehouse/manage/views/__init__.py:1122
#: warehouse/manage/views/__init__.py:1126
msgid "2FA requirement cannot be disabled for critical projects"
msgstr ""

#: warehouse/manage/views/__init__.py:1477
#: warehouse/manage/views/__init__.py:1778
#: warehouse/manage/views/__init__.py:1886
#: warehouse/manage/views/__init__.py:1481
#: warehouse/manage/views/__init__.py:1782
#: warehouse/manage/views/__init__.py:1890
msgid ""
"Project deletion temporarily disabled. See https://pypi.org/help#admin-"
"intervention for details."
msgstr ""

#: warehouse/manage/views/__init__.py:1609
#: warehouse/manage/views/__init__.py:1694
#: warehouse/manage/views/__init__.py:1795
#: warehouse/manage/views/__init__.py:1895
#: warehouse/manage/views/__init__.py:1613
#: warehouse/manage/views/__init__.py:1698
#: warehouse/manage/views/__init__.py:1799
#: warehouse/manage/views/__init__.py:1899
msgid "Confirm the request"
msgstr ""

#: warehouse/manage/views/__init__.py:1621
#: warehouse/manage/views/__init__.py:1625
msgid "Could not yank release - "
msgstr ""

#: warehouse/manage/views/__init__.py:1706
#: warehouse/manage/views/__init__.py:1710
msgid "Could not un-yank release - "
msgstr ""

#: warehouse/manage/views/__init__.py:1807
#: warehouse/manage/views/__init__.py:1811
msgid "Could not delete release - "
msgstr ""

#: warehouse/manage/views/__init__.py:1907
#: warehouse/manage/views/__init__.py:1911
msgid "Could not find file"
msgstr ""

#: warehouse/manage/views/__init__.py:1911
#: warehouse/manage/views/__init__.py:1915
msgid "Could not delete file - "
msgstr ""

#: warehouse/manage/views/__init__.py:2061
#: warehouse/manage/views/__init__.py:2065
msgid "Team '${team_name}' already has ${role_name} role for project"
msgstr ""

#: warehouse/manage/views/__init__.py:2168
#: warehouse/manage/views/__init__.py:2172
msgid "User '${username}' already has ${role_name} role for project"
msgstr ""

#: warehouse/manage/views/__init__.py:2235
#: warehouse/manage/views/__init__.py:2239
msgid "${username} is now ${role} of the '${project_name}' project."
msgstr ""

#: warehouse/manage/views/__init__.py:2267
#: warehouse/manage/views/__init__.py:2271
msgid ""
"User '${username}' does not have a verified primary email address and "
"cannot be added as a ${role_name} for project"
msgstr ""

#: warehouse/manage/views/__init__.py:2280
#: warehouse/manage/views/__init__.py:2284
#: warehouse/manage/views/organizations.py:882
msgid "User '${username}' already has an active invite. Please try again later."
msgstr ""

#: warehouse/manage/views/__init__.py:2345
#: warehouse/manage/views/__init__.py:2349
#: warehouse/manage/views/organizations.py:947
msgid "Invitation sent to '${username}'"
msgstr ""

#: warehouse/manage/views/__init__.py:2378
#: warehouse/manage/views/__init__.py:2382
msgid "Could not find role invitation."
msgstr ""

#: warehouse/manage/views/__init__.py:2389
#: warehouse/manage/views/__init__.py:2393
msgid "Invitation already expired."
msgstr ""

#: warehouse/manage/views/__init__.py:2421
#: warehouse/manage/views/__init__.py:2425
#: warehouse/manage/views/organizations.py:1134
msgid "Invitation revoked from '${username}'."
msgstr ""
Expand Down
8 changes: 6 additions & 2 deletions warehouse/manage/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,13 @@ def delete_account(self):
return self.default_response

form = ConfirmPasswordForm(
formdata=MultiDict(
{
"password": confirm_password,
"username": self.request.user.username,
}
),
request=self.request,
password=confirm_password,
username=self.request.user.username,
user_service=self.user_service,
)

Expand Down

0 comments on commit d9c18a0

Please sign in to comment.