[PR #1604] [MERGED] Two-step login organization policy enforcement - Resolves dani-garcia/bitwarden_rs#981 #2983

New issue

Closed

opened 2026-03-03 09:09:13 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 09:09:13 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/1604
Author: @olivierIllogika
Created: 4/12/2021
Status: ✅ Merged
Merged: 7/15/2021
Merged by: @dani-garcia

Base: main ← Head: 2fa_enforcement

📝 Commits (8)

d75a80b Resolves dani-garcia/bitwarden_rs#981
1db37bf make error toast display detailed message
2421d49 Merge branch 'master' of github.com:dani-garcia/bitwarden_rs into 2fa_enforcement
89a6874 ran cargo fmt --all
e3c4609 Merge commit '3da44a8d30' into 2fa_enforcement
cc021a4 project name and links in new email templates
f707f86 Merge commit '1e5306b820' into 2fa_enforcement
39167d3 Merge commit '0d63132987' into 2fa_enforcement

📊 Changes

9 files changed (+223 additions, -7 deletions)

View changed files

📝 src/api/core/organizations.rs (+31 -0)
📝 src/api/core/two_factor/mod.rs (+19 -4)
📝 src/config.rs (+1 -0)
📝 src/db/models/org_policy.rs (+1 -1)
📝 src/db/models/organization.rs (+20 -1)
📝 src/error.rs (+1 -1)
📝 src/mail.rs (+12 -0)
➕ src/static/templates/email/send_2fa_removed_from_org.hbs (+9 -0)
➕ src/static/templates/email/send_2fa_removed_from_org.html.hbs (+129 -0)

📄 Description

a user without 2fa trying to join a 2fa org will fail, but user gets an email to enable 2fa
a user disabling 2fa will be removed from 2fa orgs; user gets an email for each org
an org enabling 2fa policy will remove users without 2fa; users get an email

_{🔄 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/1604 **Author:** [@olivierIllogika](https://github.com/olivierIllogika) **Created:** 4/12/2021 **Status:** ✅ Merged **Merged:** 7/15/2021 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `2fa_enforcement` --- ### 📝 Commits (8) - [`d75a80b`](https://github.com/dani-garcia/vaultwarden/commit/d75a80bd2dbe21e5a1eb2b0a6b18a9422441e071) Resolves dani-garcia/bitwarden_rs#981 - [`1db37bf`](https://github.com/dani-garcia/vaultwarden/commit/1db37bf3d06543c890612ff88193813035763034) make error toast display detailed message - [`2421d49`](https://github.com/dani-garcia/vaultwarden/commit/2421d49d9a64cf235f0c885a6063a3bb3628bdda) Merge branch 'master' of github.com:dani-garcia/bitwarden_rs into 2fa_enforcement - [`89a6874`](https://github.com/dani-garcia/vaultwarden/commit/89a68741d6c049e827e84dc224566d1a61dda1f7) ran cargo fmt --all - [`e3c4609`](https://github.com/dani-garcia/vaultwarden/commit/e3c4609c2a43800de98abbd7da188e982fedf8c0) Merge commit '3da44a8d30e76f48b84f5b888e0b33427037037c' into 2fa_enforcement - [`cc021a4`](https://github.com/dani-garcia/vaultwarden/commit/cc021a47843a10b2923af82113a6d6a7045d2bdf) project name and links in new email templates - [`f707f86`](https://github.com/dani-garcia/vaultwarden/commit/f707f86c8e50c16898b971633f38b131d6242e35) Merge commit '1e5306b8203a7ebe24047910e6c690c18c6d827a' into 2fa_enforcement - [`39167d3`](https://github.com/dani-garcia/vaultwarden/commit/39167d333ad752af26e7cb9cb6154534e91634c3) Merge commit '0d631329873196935ba29db985c5e32def391251' into 2fa_enforcement ### 📊 Changes **9 files changed** (+223 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `src/api/core/organizations.rs` (+31 -0) 📝 `src/api/core/two_factor/mod.rs` (+19 -4) 📝 `src/config.rs` (+1 -0) 📝 `src/db/models/org_policy.rs` (+1 -1) 📝 `src/db/models/organization.rs` (+20 -1) 📝 `src/error.rs` (+1 -1) 📝 `src/mail.rs` (+12 -0) ➕ `src/static/templates/email/send_2fa_removed_from_org.hbs` (+9 -0) ➕ `src/static/templates/email/send_2fa_removed_from_org.html.hbs` (+129 -0) </details> ### 📄 Description * a user without 2fa trying to join a 2fa org will fail, but user gets an email to enable 2fa * a user disabling 2fa will be removed from 2fa orgs; user gets an email for each org * an org enabling 2fa policy will remove users without 2fa; users get an email --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>