[PR #4916] [MERGED] Actually use Device Type for mails #20363

New Issue

Closed

opened 2026-04-25 22:29:45 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-25 22:29:45 -05:00

Owner

Copy Link

Copy Source

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/4916
Author: @dfunkt
Created: 9/3/2024
Status: ✅ Merged
Merged: 9/18/2024
Merged by: @dani-garcia

Base: main ← Head: email-device-type

---

📝 Commits (1)

• aff302a Actually use Device Type for mails

📊 Changes

17 files changed (+57 additions, -21 deletions)

View changed files

➕ migrations/mysql/2024-09-04-091351_use_device_type_for_mails/down.sql (+1 -0)
➕ migrations/mysql/2024-09-04-091351_use_device_type_for_mails/up.sql (+1 -0)
➕ migrations/postgresql/2024-09-04-091351_use_device_type_for_mails/down.sql (+1 -0)
➕ migrations/postgresql/2024-09-04-091351_use_device_type_for_mails/up.sql (+1 -0)
➕ migrations/sqlite/2024-09-04-091351_use_device_type_for_mails/down.sql (+1 -0)
➕ migrations/sqlite/2024-09-04-091351_use_device_type_for_mails/up.sql (+1 -0)
📝 src/api/core/two_factor/mod.rs (+8 -2)
📝 src/api/identity.rs (+3 -3)
📝 src/db/models/two_factor_incomplete.rs (+3 -0)
📝 src/db/schemas/mysql/schema.rs (+1 -0)
📝 src/db/schemas/postgresql/schema.rs (+1 -0)
📝 src/db/schemas/sqlite/schema.rs (+1 -0)
📝 src/mail.rs (+13 -7)
📝 src/static/templates/email/incomplete_2fa_login.hbs (+3 -2)
📝 src/static/templates/email/incomplete_2fa_login.html.hbs (+7 -2)
📝 src/static/templates/email/new_device_logged_in.hbs (+4 -3)
📝 src/static/templates/email/new_device_logged_in.html.hbs (+7 -2)

📄 Description

• match Bitwarden behaviour
• remove upcase_first, no longer needed and it would also interfere with device types like iOS, macOS

Examples:

Chrome Extension
Before -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Chrome
After -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Chrome Extension

Poco F3 (shows up as M2012K11AG)
Before -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: M2012K11AG
After -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Android

---

_{🔄 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/4916 **Author:** [@dfunkt](https://github.com/dfunkt) **Created:** 9/3/2024 **Status:** ✅ Merged **Merged:** 9/18/2024 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `email-device-type` --- ### 📝 Commits (1) - [`aff302a`](https://github.com/dani-garcia/vaultwarden/commit/aff302a8fb770365d42acf59de112f2774f219ab) Actually use Device Type for mails ### 📊 Changes **17 files changed** (+57 additions, -21 deletions) <details> <summary>View changed files</summary> ➕ `migrations/mysql/2024-09-04-091351_use_device_type_for_mails/down.sql` (+1 -0) ➕ `migrations/mysql/2024-09-04-091351_use_device_type_for_mails/up.sql` (+1 -0) ➕ `migrations/postgresql/2024-09-04-091351_use_device_type_for_mails/down.sql` (+1 -0) ➕ `migrations/postgresql/2024-09-04-091351_use_device_type_for_mails/up.sql` (+1 -0) ➕ `migrations/sqlite/2024-09-04-091351_use_device_type_for_mails/down.sql` (+1 -0) ➕ `migrations/sqlite/2024-09-04-091351_use_device_type_for_mails/up.sql` (+1 -0) 📝 `src/api/core/two_factor/mod.rs` (+8 -2) 📝 `src/api/identity.rs` (+3 -3) 📝 `src/db/models/two_factor_incomplete.rs` (+3 -0) 📝 `src/db/schemas/mysql/schema.rs` (+1 -0) 📝 `src/db/schemas/postgresql/schema.rs` (+1 -0) 📝 `src/db/schemas/sqlite/schema.rs` (+1 -0) 📝 `src/mail.rs` (+13 -7) 📝 `src/static/templates/email/incomplete_2fa_login.hbs` (+3 -2) 📝 `src/static/templates/email/incomplete_2fa_login.html.hbs` (+7 -2) 📝 `src/static/templates/email/new_device_logged_in.hbs` (+4 -3) 📝 `src/static/templates/email/new_device_logged_in.html.hbs` (+7 -2) </details> ### 📄 Description - match Bitwarden behaviour - remove upcase_first, no longer needed and it would also interfere with device types like iOS, macOS Examples: Chrome Extension Before -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Chrome After -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Chrome Extension Poco F3 (shows up as M2012K11AG) Before -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: M2012K11AG After -> New Device Logged In From/Incomplete Two-Step Login From/Device Type: Android --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2026-04-25 22:29:46 -05:00

GiteaMirror closed this issue 2026-04-25 22:29:47 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

various_fixes

revert-7033-patch-1

cached-config-operations

test_dylint

1.36.0

1.35.8

1.35.7

1.35.6

1.35.5

1.35.4

1.35.3

1.35.2

1.35.1

1.35.0

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

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

wontfix

No labels pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

GiteaMirror ninjasurge (Kaehlen Rog)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#20363