[PR #2044] [MERGED] Emergency Access cleanup #3310

New Issue

Open

opened 2025-10-09 18:21:00 +03:00 by OVERLORD · 0 comments

OVERLORD commented 2025-10-09 18:21:00 +03:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/2044
Author: @jjlin
Created: 10/19/2021
Status: ✅ Merged
Merged: 10/19/2021
Merged by: @dani-garcia

Base: main ← Head: emergency-access-cleanup

---

📝 Commits (1)

• cee3fd5 Emergency Access cleanup

📊 Changes

21 files changed (+101 additions, -101 deletions)

View changed files

📝 .env.template (+10 -9)
📝 src/api/core/accounts.rs (+3 -4)
📝 src/api/core/emergency_access.rs (+4 -4)
📝 src/config.rs (+5 -5)
📝 src/db/models/emergency_access.rs (+37 -45)
📝 src/mail.rs (+2 -2)
📝 src/main.rs (+9 -0)
📝 src/static/templates/email/emergency_access_invite_accepted.hbs (+2 -2)
📝 src/static/templates/email/emergency_access_invite_accepted.html.hbs (+3 -3)
📝 src/static/templates/email/emergency_access_invite_confirmed.hbs (+3 -3)
📝 src/static/templates/email/emergency_access_invite_confirmed.html.hbs (+4 -5)
📝 src/static/templates/email/emergency_access_recovery_approved.hbs (+2 -2)
📝 src/static/templates/email/emergency_access_recovery_approved.html.hbs (+3 -3)
📝 src/static/templates/email/emergency_access_recovery_initiated.hbs (+1 -1)
📝 src/static/templates/email/emergency_access_recovery_initiated.html.hbs (+2 -2)
📝 src/static/templates/email/emergency_access_recovery_rejected.hbs (+1 -1)
📝 src/static/templates/email/emergency_access_recovery_rejected.html.hbs (+2 -2)
📝 src/static/templates/email/emergency_access_recovery_reminder.hbs (+2 -2)
📝 src/static/templates/email/emergency_access_recovery_reminder.html.hbs (+3 -3)
📝 src/static/templates/email/emergency_access_recovery_timed_out.hbs (+1 -1)

...and 1 more files

📄 Description

This commit contains mostly superficial user-facing cleanup, to be followed up
with more extensive cleanup and fixes in the API implementation.

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/2044 **Author:** [@jjlin](https://github.com/jjlin) **Created:** 10/19/2021 **Status:** ✅ Merged **Merged:** 10/19/2021 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `emergency-access-cleanup` --- ### 📝 Commits (1) - [`cee3fd5`](https://github.com/dani-garcia/vaultwarden/commit/cee3fd5ba284f376cd05755dbc9cd6b7ded297ed) Emergency Access cleanup ### 📊 Changes **21 files changed** (+101 additions, -101 deletions) <details> <summary>View changed files</summary> 📝 `.env.template` (+10 -9) 📝 `src/api/core/accounts.rs` (+3 -4) 📝 `src/api/core/emergency_access.rs` (+4 -4) 📝 `src/config.rs` (+5 -5) 📝 `src/db/models/emergency_access.rs` (+37 -45) 📝 `src/mail.rs` (+2 -2) 📝 `src/main.rs` (+9 -0) 📝 `src/static/templates/email/emergency_access_invite_accepted.hbs` (+2 -2) 📝 `src/static/templates/email/emergency_access_invite_accepted.html.hbs` (+3 -3) 📝 `src/static/templates/email/emergency_access_invite_confirmed.hbs` (+3 -3) 📝 `src/static/templates/email/emergency_access_invite_confirmed.html.hbs` (+4 -5) 📝 `src/static/templates/email/emergency_access_recovery_approved.hbs` (+2 -2) 📝 `src/static/templates/email/emergency_access_recovery_approved.html.hbs` (+3 -3) 📝 `src/static/templates/email/emergency_access_recovery_initiated.hbs` (+1 -1) 📝 `src/static/templates/email/emergency_access_recovery_initiated.html.hbs` (+2 -2) 📝 `src/static/templates/email/emergency_access_recovery_rejected.hbs` (+1 -1) 📝 `src/static/templates/email/emergency_access_recovery_rejected.html.hbs` (+2 -2) 📝 `src/static/templates/email/emergency_access_recovery_reminder.hbs` (+2 -2) 📝 `src/static/templates/email/emergency_access_recovery_reminder.html.hbs` (+3 -3) 📝 `src/static/templates/email/emergency_access_recovery_timed_out.hbs` (+1 -1) _...and 1 more files_ </details> ### 📄 Description This commit contains mostly superficial user-facing cleanup, to be followed up with more extensive cleanup and fixes in the API implementation. --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

OVERLORD added the pull-request label 2025-10-09 18:21:00 +03:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

test_dylint

1.34.3

1.34.2

1.34.1

1.34.0

1.33.2

1.33.1

1.33.0

1.32.7

1.32.6

1.32.5

1.32.4

1.32.3

1.32.2

1.32.1

1.32.0

1.31.0

1.30.5

1.30.4

1.30.3

1.30.2

1.30.1

1.30.0

1.29.2

1.29.1

1.29.0

1.28.1

1.28.0

1.27.0

1.26.0

1.25.2

1.25.1

1.25.0

1.24.0

1.23.1

1.23.0

1.22.2

1.22.1

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.3

1.16.2

1.16.1

1.16.0

1.15.1

1.15.0

1.14.2

1.14.1

1.14

1.13.1

1.13.0

1.12.0

1.11.0

1.10.0

1.9.1

1.9.0

1.8.0

1.7.0

1.6.1

1.6.0

1.5.0

1.4.0

1.3.0

1.2.0

1.1.0

1.0.0

0.13.0

0.12.0

0.11.0

0.10.0

0.9.0

Labels

Clear labels

better for forum

bug

bug

bug

documentation

duplicate

enhancement

future Vault

good first issue

help wanted

low priority

notes

pull-request

Mirrored from GitHub Pull Request

question

SSO

Third party

troubleshooting

troubleshooting

wontfix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

OVERLORD

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/vaultwarden#3310