Fix org import

Fmt
Fix get_groups_data when not using full_access
2026-10-29 23:36:48 +02:00 · 2026-07-24 16:36:11 +02:00 · 2026-07-24 16:32:50 +02:00 · 2026-07-24 16:20:34 +02:00 · 2026-07-24 15:47:51 +02:00 · 2026-07-20 01:24:46 +02:00
149 changed files with 25260 additions and 18991 deletions
@@ -1,7 +1,7 @@
-# Ignore everything
+// Ignore everything
 *
-# Allow what is needed
+// Allow what is needed
 !.git
 !docker/healthcheck.sh
 !docker/start.sh
@@ -180,7 +180,7 @@
 ## Defaults to every minute. Set blank to disable this job.
 # AUTH_REQUEST_PURGE_SCHEDULE="30 * * * * *"
 ##
-## Cron schedule of the job that cleans expired Duo contexts from the database. Does nothing if Duo MFA is disabled.
+## Cron schedule of the job that cleans expired Duo contexts from the database. Does nothing if Duo MFA is disabled or set to use the legacy iframe prompt.
 ## Defaults to every minute. Set blank to disable this job.
 # DUO_CONTEXT_PURGE_SCHEDULE="30 * * * * *"
 #
@@ -316,14 +316,6 @@
 ## unauthenticated access to potentially sensitive data.
 # SHOW_PASSWORD_HINT=false
 #########################
 ### Client settings  ###
 #########################
 ## Control whether clients onboarding interstitials are suppressed
 ## (post-login welcome dialogs, extension install prompts, setup extension redirects, and premium upsell modals)
 # CLIENT_SUPPRESS_ONBOARDING=false
 #########################
 ### Advanced settings ###
 #########################
@@ -338,8 +330,6 @@
 ## "local" accepts it from any non global address, which covers a reverse proxy running on the same
 ## host or container network. Use "all" to accept it from anywhere, or list the addresses of your
 ## proxy as IPs and CIDR ranges if it connects from a public address.
 ## For a list header like X-Forwarded-For, the client IP is the rightmost address that isn't one of
 ## these proxies, so with several proxies in a row (a CDN in front of nginx, for example) list all of them.
 # IP_HEADER_TRUSTED_PROXIES=local
 ## Icon service
@@ -392,17 +382,21 @@
 ##
 ## The following flags are available:
 ## - "pm-5594-safari-account-switching": Enable account switching in Safari. (Safari >= 2026.2.0)
-## - "pm-32413-multi-client-password-management": Enable changing the master password directly in the client. (Desktop/Extension >= 2026.4.0)
+## - "ssh-agent": Enable SSH agent support on Desktop. (Desktop >= 2024.12.0)
 ## - "ssh-agent-v2": Enable newer SSH agent support. (Desktop >= 2026.2.1)
-## - "windows-desktop-autotype": Enable the autotype feature preview on Windows. (Desktop >= 2025.8.0)
+## - "ssh-key-vault-item": Enable the creation and use of SSH key vault items. (Clients >= 2024.12.0)
-## - "windows-desktop-autotype-ga": Enable the new, still in development, autotype implementation on Windows. (Desktop >= 2026.9.1)
+## - "pm-25373-windows-biometrics-v2": Enable the new implementation of biometrics on Windows. (Desktop >= 2025.11.0)
-##   Only enable one of the two autotype flags, the clients disable autotype completely when both are enabled.
+## - "pm-26340-linux-biometrics-v2": Enable the new implementation of biometrics on Linux. (Desktop >= 2025.11.0)
 ## - "anon-addy-self-host-alias": Enable configuring self-hosted Anon Addy alias generator. (Android >= 2025.3.0, iOS >= 2025.4.0)
 ## - "simple-login-self-host-alias": Enable configuring self-hosted Simple Login alias generator. (Android >= 2025.3.0, iOS >= 2025.4.0)
 ## - "mutual-tls": Enable the use of mutual TLS on Android (Clients >= 2025.2.0)
 ## - "cxp-import-mobile": Enable the import via CXP on iOS (Clients >= 2025.9.2)
 ## - "cxp-export-mobile": Enable the export via CXP on iOS (Clients >= 2025.9.2)
 ## - "pm-30529-webauthn-related-origins":
-## - "pm-32009-new-item-types": Enable new item types: Bank Account, Driver's License, and Passport (Clients >= 2026.4.0)
+## - "desktop-ui-migration-milestone-1": Special feature flag for desktop UI (Desktop >= 2026.2.0)
-## - "pm-34171-card-scanner": Enable the new card scanner feature on mobile (Android >= 2026.4.1, iOS >= 2026.4.1)
+## - "desktop-ui-migration-milestone-2": Special feature flag for desktop UI (Desktop >= 2026.2.0)
-## - "enable-basic-auth-response": Enable HTTP Basic Auth autofill in the browser extension (Browser >= 2026.9.0)
+## - "desktop-ui-migration-milestone-3": Special feature flag for desktop UI (Desktop >= 2026.2.0)
-## - "undetermined-cipher-scenario-logic": Enable the rewritten add/update login notification triggering logic in the browser extension (Browser >= 2026.2.0)
+## - "desktop-ui-migration-milestone-4": Special feature flag for desktop UI (Desktop >= 2026.2.0)
 ## - "biometrics-sdk-ipc": Enable biometric unlock over the SDK IPC framework (Desktop >= 2026.9.0, Browser >= 2026.9.0)
 # EXPERIMENTAL_CLIENT_FEATURE_FLAGS=
 ## Require new device emails. When a user logs in an email is required to be sent.
@@ -516,9 +510,6 @@
 ## Prevent users from logging in directly without going through SSO
 # SSO_ONLY=false
 ## Allow SSO flow to create account. You probably want to disable it when using a public provider.
 # SSO_SIGNUPS_ALLOWED=true
 ## On SSO Signup if a user with a matching email already exists make the association
 # SSO_SIGNUPS_MATCH_EMAIL=true
@@ -581,6 +572,11 @@
 # DUO_HOST=<API Hostname>
 ## After that, you should be able to follow the rest of the guide linked above,
 ## ignoring the fields that ask for the values that you already configured beforehand.
 ##
 ## If you want to attempt to use Duo's 'Traditional Prompt' (deprecated, iframe based) set DUO_USE_IFRAME to 'true'.
 ## Duo no longer supports this, but it still works for some integrations.
 ## If you aren't sure, leave this alone.
 # DUO_USE_IFRAME=false
 ## Email 2FA settings
 ## Email token size
@@ -62,7 +62,7 @@ jobs:
      # Checkout the repo
      - name: "Checkout"
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
          fetch-depth: 0
@@ -113,7 +113,7 @@ jobs:
      # Enable Rust Caching
      - name: Rust Caching
-        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
        with:
          # Use a custom prefix-key to force a fresh start. This is sometimes needed with bigger changes.
          # Like changing the build host from Ubuntu 20.04 to 22.04 for example.
@@ -20,7 +20,7 @@ jobs:
    steps:
      # Checkout the repo
      - name: "Checkout"
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      # End Checkout the repo
@@ -20,7 +20,7 @@ jobs:
    steps:
      # Start Docker Buildx
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
        # https://github.com/moby/buildkit/issues/3969
        # Also set max parallelism to 2, the default of 4 breaks GitHub Actions and causes OOMKills
        with:
@@ -32,7 +32,7 @@ jobs:
      # Checkout the repo
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      # End Checkout the repo
@@ -41,12 +41,12 @@ jobs:
      # Uses the Docker-based action (hadolint pre-bundled in ghcr.io/hadolint/hadolint:v2.14.0-debian)
      # so no binary is downloaded at runtime. Pinned by commit SHA for supply-chain safety.
      - name: Run hadolint on Dockerfile.debian
-        uses: hadolint/hadolint-action@06be81baf89a55ffd0e24b8f04a4185738dd3387 # v3.5.0
+        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: docker/Dockerfile.debian
      - name: Run hadolint on Dockerfile.alpine
-        uses: hadolint/hadolint-action@06be81baf89a55ffd0e24b8f04a4185738dd3387 # v3.5.0
+        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: docker/Dockerfile.alpine
      # End Test Dockerfiles with hadolint
@@ -58,13 +58,13 @@ jobs:
    steps:
      - name: Initialize QEMU binfmt support
-        uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0
+        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
        with:
          platforms: "arm64,arm"
      # Start Docker Buildx
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
        # https://github.com/moby/buildkit/issues/3969
        # Also set max parallelism to 2, the default of 4 breaks GitHub Actions and causes OOMKills
        with:
@@ -77,7 +77,7 @@ jobs:
      # Checkout the repo
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        # We need fetch-depth of 0 so we also get all the tag metadata
        with:
          persist-credentials: false
@@ -106,7 +106,7 @@ jobs:
      # Login to Docker Hub
      - name: Login to Docker Hub
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -121,7 +121,7 @@ jobs:
      # Login to GitHub Container Registry
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -137,7 +137,7 @@ jobs:
      # Login to Quay.io
      - name: Login to Quay.io
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
@@ -185,7 +185,7 @@ jobs:
      - name: Bake ${{ matrix.base_image }} containers
        id: bake_vw
-        uses: docker/bake-action@018cb6412ab401ebaa809aa5f85966b74628600f # v7.4.0
+        uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7.3.0
        env:
          BASE_TAGS: "${{ steps.determine-version.outputs.BASE_TAGS }}"
          SOURCE_COMMIT: "${{ env.SOURCE_COMMIT }}"
@@ -237,7 +237,7 @@ jobs:
      # Upload artifacts to Github Actions and Attest the binaries
      - name: Attest binaries
-        uses: actions/attest@1e69f48acb82d1966a394da916b4c1698aa569d6 # v4.2.2
+        uses: actions/attest@a1948c3f048ba23858d222213b7c278aabede763 # v4.1.1
        with:
          subject-path: vaultwarden-${{ env.NORMALIZED_ARCH }}
@@ -272,7 +272,7 @@ jobs:
      # Login to Docker Hub
      - name: Login to Docker Hub
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -287,7 +287,7 @@ jobs:
      # Login to GitHub Container Registry
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -303,7 +303,7 @@ jobs:
      # Login to Quay.io
      - name: Login to Quay.io
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
@@ -365,7 +365,7 @@ jobs:
      # Attest container images
      - name: Attest - docker.io - ${{ matrix.base_image }}
        if: ${{ vars.DOCKERHUB_REPO != '' && env.DIGEST_SHA != ''}}
-        uses: actions/attest@1e69f48acb82d1966a394da916b4c1698aa569d6 # v4.2.2
+        uses: actions/attest@a1948c3f048ba23858d222213b7c278aabede763 # v4.1.1
        with:
          subject-name: ${{ vars.DOCKERHUB_REPO }}
          subject-digest: ${{ env.DIGEST_SHA }}
@@ -373,7 +373,7 @@ jobs:
      - name: Attest - ghcr.io - ${{ matrix.base_image }}
        if: ${{ vars.GHCR_REPO != '' && env.DIGEST_SHA != ''}}
-        uses: actions/attest@1e69f48acb82d1966a394da916b4c1698aa569d6 # v4.2.2
+        uses: actions/attest@a1948c3f048ba23858d222213b7c278aabede763 # v4.1.1
        with:
          subject-name: ${{ vars.GHCR_REPO }}
          subject-digest: ${{ env.DIGEST_SHA }}
@@ -381,7 +381,7 @@ jobs:
      - name: Attest - quay.io - ${{ matrix.base_image }}
        if: ${{ vars.QUAY_REPO != '' && env.DIGEST_SHA != ''}}
-        uses: actions/attest@1e69f48acb82d1966a394da916b4c1698aa569d6 # v4.2.2
+        uses: actions/attest@a1948c3f048ba23858d222213b7c278aabede763 # v4.1.1
        with:
          subject-name: ${{ vars.QUAY_REPO }}
          subject-digest: ${{ env.DIGEST_SHA }}
@@ -33,7 +33,7 @@ jobs:
    steps:
      - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
@@ -50,6 +50,6 @@ jobs:
          severity: CRITICAL,HIGH
      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
        with:
          sarif_file: 'trivy-results.sarif'
@@ -16,11 +16,11 @@ jobs:
    steps:
      # Checkout the repo
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      # End Checkout the repo
      # When this version is updated, do not forget to update this in `.pre-commit-config.yaml` too
      - name: Spell Check Repo
-        uses: crate-ci/typos@00f422f3b19c57bc6338715ebfe3316d38768461 # v1.50.3
+        uses: crate-ci/typos@bee27e3a4fd1ea2111cf90ab89cd076c870fce14 # v1.48.0
@@ -19,12 +19,12 @@ jobs:
      security-events: write # To write the security report
    steps:
      - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          persist-credentials: false
      - name: Run zizmor
-        uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
        with:
          # intentionally not scanning the entire repository,
          # since it contains integration tests.
@@ -18,10 +18,9 @@ repos:
  # When this version is updated, do not forget to update this in `.github/workflows/typos.yaml` too
  - repo: https://github.com/crate-ci/typos
-    rev: 00f422f3b19c57bc6338715ebfe3316d38768461 # v1.50.3
+    rev: bee27e3a4fd1ea2111cf90ab89cd076c870fce14 # v1.48.0
    hooks:
      - id: typos
        always_run: true
  - repo: local
    hooks:
@@ -39,7 +38,8 @@ repos:
        entry: cargo test
        language: system
        args: [ "--features", "sqlite,mysql,postgresql", "--" ]
-        types_or: [ rust, toml ] # Cargo.lock matches toml type which is intended
+        types_or: [ rust, file ]
        files: (Cargo.toml|Cargo.lock|rust-toolchain.toml|rustfmt.toml|.*\.rs$)
        pass_filenames: false
      - id: cargo-clippy
        name: cargo clippy
@@ -47,7 +47,8 @@ repos:
        entry: cargo clippy
        language: system
        args: [ "--features", "sqlite,mysql,postgresql", "--", "-D", "warnings" ]
-        types_or: [ rust, toml ] # Cargo.lock matches toml type which is intended
+        types_or: [ rust, file ]
        files: (Cargo.toml|Cargo.lock|rust-toolchain.toml|rustfmt.toml|.*\.rs$)
        pass_filenames: false
      - id: check-docker-templates
        name: check docker templates
@@ -14,8 +14,9 @@ extend-ignore-re = [
    # In SMTP it's called HELO, so ignore it
    "(?i)helo_name",
    "Server name sent during.+HELO",
-    # COSE Is short for CBOR Object Signing and Encryption
+    # COSE Is short for CBOR Object Signing and Encryption, ignore these specific items
-    "(?i)cose",
+    "COSEKey",
    "COSEAlgorithm",
    # Ignore this specific string as it's valid
    "Ensure they are valid OTPs",
    # This word is misspelled upstream
@@ -1,6 +1,6 @@
 [workspace.package]
 edition = "2024"
-rust-version = "1.97.1"
+rust-version = "1.94.1"
 license = "AGPL-3.0-only"
 repository = "https://github.com/dani-garcia/vaultwarden"
 publish = false
@@ -12,6 +12,7 @@ members = ["macros"]
 name = "vaultwarden"
 version = "1.0.0"
 authors = ["Daniel García <dani-garcia@users.noreply.github.com>"]
 readme = "README.md"
 build = "build.rs"
 repository.workspace = true
 edition.workspace = true
@@ -40,7 +41,6 @@ vendored_openssl = ["openssl/vendored"]
 enable_mimalloc = ["dep:mimalloc"]
 s3 = [
    "opendal/services-s3",
    "dep:opendal-http-transport-reqwest",
    "dep:aws-config",
    "dep:aws-credential-types",
    "dep:aws-smithy-runtime-api",
@@ -58,7 +58,6 @@ oidc-accept-string-booleans = ["openidconnect/accept-string-booleans"]
 unstable = []
 [target."cfg(unix)".dependencies]
 nix = { version = "0.31.3", features = ["fs"] }
 # Logging
 syslog = "7.0.0"
@@ -66,7 +65,7 @@ syslog = "7.0.0"
 macros = { path = "./macros" }
 # Logging
-log = "0.4.34"
+log = "0.4.33"
 fern = { version = "0.7.1", features = ["syslog-7", "reopen-1"] }
 # We need the `log` feature for `tracing` to enable logging for several crates to work, like lettre or webauthn-rs
 tracing = { version = "0.1.44", features = ["log"] }
@@ -76,8 +75,8 @@ dotenvy = { version = "0.15.7", default-features = false }
 # Numerical libraries
 num-traits = "0.2.19"
-num-derive = "0.5.1"
+num-derive = "0.4.2"
-bigdecimal = "0.4.11"
+bigdecimal = "0.4.10"
 # Web framework
 rocket = { version = "0.5.1", default-features = false, features = ["json", "tls"] }
@@ -90,8 +89,8 @@ rmpv = "1.3.1" # MessagePack library
 dashmap = "6.2.1"
 # Async futures
-futures = "0.3.34"
+futures = "0.3.32"
-tokio = { version = "1.53.2", features = [
+tokio = { version = "1.52.3", features = [
    "fs",
    "io-util",
    "net",
@@ -100,14 +99,14 @@ tokio = { version = "1.53.2", features = [
    "signal",
    "time",
 ] }
-tokio-util = { version = "0.7.19", features = ["compat"] }
+tokio-util = { version = "0.7.18", features = ["compat"] }
 # A generic serialization/deserialization framework
-serde = { version = "1.0.229", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.151"
+serde_json = "1.0.150"
 # A safe, extensible ORM and Query builder
-diesel = { version = "2.3.13", features = ["chrono", "r2d2", "numeric", "64-column-tables"] }
+diesel = { version = "2.3.10", features = ["chrono", "r2d2", "numeric"] }
 diesel_migrations = "2.3.2"
 derive_more = { version = "2.1.1", features = [
@@ -120,36 +119,36 @@ derive_more = { version = "2.1.1", features = [
 diesel-derive-newtype = "2.1.3"
 # SQLite, statically bundled unless the `sqlite_system` feature is enabled
-libsqlite3-sys = { version = "0.38.2", optional = true }
+libsqlite3-sys = { version = "0.37.0", optional = true }
 # Crypto-related libraries
-rand = "0.10.3"
+rand = "0.10.2"
 ring = "0.17.14"
-rustls = { version = "0.23.45", features = ["ring", "std"], default-features = false }
+rustls = { version = "0.23.41", features = ["ring", "std"], default-features = false }
 subtle = "2.6.1"
 # UUID generation
-uuid = { version = "1.27.0", features = ["v4"] }
+uuid = { version = "1.23.4", features = ["v4"] }
 # Date and time libraries
 chrono = { version = "0.4.45", default-features = false, features = ["clock", "serde"] }
 chrono-tz = "0.10.4"
-time = "0.3.55"
+time = "0.3.53"
 # Job scheduler
-job_scheduler_ng = "2.5.0"
+job_scheduler_ng = "2.4.0"
 # Data encoding library Hex/Base32/Base64
-data-encoding = "2.11.1"
+data-encoding = "2.11.0"
 # JWT library
-jsonwebtoken = { version = "11.1.0", default-features = false, features = ["rust_crypto", "use_pem"] }
+jsonwebtoken = { version = "10.4.0", default-features = false, features = ["rust_crypto", "use_pem"] }
 # TOTP library
 totp-lite = "2.0.1"
 # Yubico Library
-yubico_ng = { version = "1.0.0", default-features = false }
+yubico = { package = "yubico_ng", version = "0.15.0", default-features = false, features = ["online-tokio"] }
 # WebAuthn libraries
 # danger-allow-state-serialisation is needed to save the state in the db
@@ -162,7 +161,7 @@ webauthn-rs-core = "0.5.5"
 url = "2.5.8"
 # Email libraries
-lettre = { version = "0.11.23", default-features = false, features = [
+lettre = { version = "0.11.22", default-features = false, features = [
    # Misc
    "tracing",
    "serde",
@@ -180,10 +179,10 @@ percent-encoding = "2.3.2" # URL encoding library used for URL's in the emails
 email_address = "0.2.9"
 # HTML Template library
-handlebars = { version = "6.4.4", features = ["dir_source"] }
+handlebars = { version = "6.4.2", features = ["dir_source"] }
 # HTTP client (Used for favicons, version check, DUO and HIBP API)
-reqwest = { version = "0.13.5", default-features = false, features = [
+reqwest = { version = "0.13.4", default-features = false, features = [
    # Misc
    "charset",
    "cookies",
@@ -201,24 +200,24 @@ reqwest = { version = "0.13.5", default-features = false, features = [
    "socks",
    "system-proxy",
 ] }
-hickory-resolver = "0.26.3"
+hickory-resolver = "0.26.1"
 # Favicon extraction libraries
 html5gum = "0.8.4"
-regex = { version = "1.13.1", default-features = false, features = [
+regex = { version = "1.12.4", default-features = false, features = [
    "perf",
    "std",
    "unicode-perl",
 ] }
 data-url = "0.3.2"
 bytes = "1.12.1"
-svg-hush = "0.9.7"
+svg-hush = "0.9.6"
 # Cache function results (Used for version check and favicon fetching)
-cached = { version = "4.0.1", features = ["async"] }
+cached = { version = "2.0.2", features = ["async"] }
 # Used for custom short lived cookie jar during favicon extraction
-cookie = "0.18.2"
+cookie = "0.18.1"
 cookie_store = "0.22.1"
 # Used by U2F, JWT and PostgreSQL
@@ -232,11 +231,11 @@ pastey = "0.2.3"
 governor = "0.10.4"
 # CIDR parsing for the trusted proxies of the client IP header
-ipnet = "2.12.2"
+ipnet = "2.12.0"
 # OIDC for SSO
 openidconnect = { version = "4.0.1", default-features = false }
-moka = { version = "0.12.16", features = ["future"] }
+moka = { version = "0.12.15", features = ["future"] }
 # Check client versions for specific features.
 semver = "1.0.28"
@@ -245,10 +244,10 @@ semver = "1.0.28"
 # Mainly used for the musl builds, since the default musl malloc is very slow
 mimalloc = { version = "0.1.52", optional = true, default-features = false, features = ["secure"] }
-which = "8.0.6"
+which = "8.0.4"
 # Argon2 library with support for the PHC format
-argon2 = "0.6.0"
+argon2 = "0.5.3"
 # Reading a password from the cli for generating the Argon2id ADMIN_TOKEN
 rpassword = "7.5.4"
@@ -257,21 +256,20 @@ rpassword = "7.5.4"
 grass_compiler = { version = "0.13.4", default-features = false }
 # File are accessed through Apache OpenDAL
-opendal = { version = "0.59.4", default-features = false, features = ["services-fs"] }
+opendal = { version = "0.57.0", default-features = false, features = ["services-fs"] }
 opendal-http-transport-reqwest = { version = "0.59.4", default-features = false, features = ["rustls-no-provider"], optional = true }
 # For retrieving AWS credentials, including temporary SSO credentials
-aws-config = { version = "1.12.0", optional = true, default-features = false, features = [
+aws-config = { version = "1.8.18", optional = true, default-features = false, features = [
    "behavior-version-latest",
    "credentials-process",
    "rt-tokio",
    "sso",
 ] }
-aws-credential-types = { version = "1.3.0", optional = true }
+aws-credential-types = { version = "1.2.14", optional = true }
-aws-smithy-runtime-api = { version = "1.19.0", optional = true }
+aws-smithy-runtime-api = { version = "1.13.0", optional = true }
-http = { version = "1.5.0", optional = true }
+http = { version = "1.4.2", optional = true }
-reqsign-aws-v4 = { version = "3.3.1", optional = true }
+reqsign-aws-v4 = { version = "3.0.1", optional = true }
-reqsign-core = { version = "3.3.2", optional = true }
+reqsign-core = { version = "3.0.1", optional = true }
 # Strip debuginfo from the release builds
 # The debug symbols are to provide better panic traces
@@ -1,12 +1,11 @@
 ---
-vault_version: "v2026.8.0"
+vault_version: "v2026.6.2"
-vault_image_digest: "sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a"
+vault_image_digest: "sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a"
 # Cross Compile Docker Helper Scripts v1.9.0
 # We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts
 # https://github.com/tonistiigi/xx | https://hub.docker.com/r/tonistiigi/xx/tags
 xx_image_digest: "sha256:c64defb9ed5a91eacb37f96ccc3d4cd72521c4bd18d5442905b95e2226b0e707"
-# The `rust_version` variable is extracted from `rust-toolchain.toml`
+rust_version: 1.96.1 # Rust version to be used
 # rust_version: x.yy.z # Rust version to be used
 debian_version: trixie # Debian release name to be used
 alpine_version: "3.24" # Alpine version to be used
 # For which platforms/architectures will we try to build images
@@ -19,23 +19,23 @@
 # - From https://hub.docker.com/r/vaultwarden/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull docker.io/vaultwarden/web-vault:v2026.8.0
+#     $ docker pull docker.io/vaultwarden/web-vault:v2026.6.2
-#     $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2026.8.0
+#     $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2026.6.2
-#     [docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a]
+#     [docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a
+#     $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a
-#     [docker.io/vaultwarden/web-vault:v2026.8.0]
+#     [docker.io/vaultwarden/web-vault:v2026.6.2]
 #
-FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a AS vault
+FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a AS vault
 ########################## ALPINE BUILD IMAGES ##########################
 ## NOTE: The Alpine Base Images do not support other platforms then linux/amd64 and linux/arm64
 ## And for Alpine we define all build images here, they will only be loaded when actually used
-FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.99.0 AS build_amd64
+FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.96.1 AS build_amd64
-FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.99.0 AS build_arm64
+FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.96.1 AS build_arm64
-FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.99.0 AS build_armv7
+FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.96.1 AS build_armv7
-FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.99.0 AS build_armv6
+FROM --platform=$BUILDPLATFORM ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.96.1 AS build_armv6
 ########################## BUILD IMAGE ##########################
 # hadolint ignore=DL3006
@@ -66,11 +66,11 @@ RUN USER=root cargo new --bin /app
 WORKDIR /app
 # Environment variables for Cargo on Alpine based builds
-RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \
+RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \
    # Output the current contents of the file
    cat /env-cargo
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    rustup target add "${CARGO_TARGET}"
 # Copies over *only* your manifests and build files
@@ -86,7 +86,7 @@ ARG DB=sqlite,mysql,postgresql,enable_mimalloc
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" && \
    find . -not -path "./target*" -delete
@@ -97,13 +97,13 @@ COPY . .
 ARG VW_VERSION
 # Builds again, this time it will be the actual source files being build
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    # Make sure that we actually build the project by updating the src/main.rs timestamp
    # Also do this for build.rs to ensure the version is rechecked
    touch build.rs src/main.rs && \
    # Create a symlink to the binary target folder to easy copy the binary in the final stage
    cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" && \
-    if [ "${CARGO_PROFILE}" = "dev" ] ; then \
+    if [[ "${CARGO_PROFILE}" == "dev" ]] ; then \
        ln -vfsr "/app/target/${CARGO_TARGET}/debug" /app/target/final ; \
    else \
        ln -vfsr "/app/target/${CARGO_TARGET}/${CARGO_PROFILE}" /app/target/final ; \
@@ -126,7 +126,6 @@ RUN . /env-cargo && \
 # To uninstall: docker run --privileged --rm tonistiigi/binfmt --uninstall 'qemu-*'
 #
 # We need to add `--platform` here, because of a podman bug: https://github.com/containers/buildah/issues/4742
 # hadolint ignore=DL3065
 FROM --platform=$TARGETPLATFORM docker.io/library/alpine:3.24
 ENV ROCKET_PROFILE="release" \
@@ -19,15 +19,15 @@
 # - From https://hub.docker.com/r/vaultwarden/web-vault/tags,
 #   click the tag name to view the digest of the image it currently points to.
 # - From the command line:
-#     $ docker pull docker.io/vaultwarden/web-vault:v2026.8.0
+#     $ docker pull docker.io/vaultwarden/web-vault:v2026.6.2
-#     $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2026.8.0
+#     $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2026.6.2
-#     [docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a]
+#     [docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a]
 #
 # - Conversely, to get the tag name from the digest:
-#     $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a
+#     $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a
-#     [docker.io/vaultwarden/web-vault:v2026.8.0]
+#     [docker.io/vaultwarden/web-vault:v2026.6.2]
 #
-FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:632375471c7c06a799335cd74dfeaef63f92f45f9cd322c337ae7ad70081e48a AS vault
+FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:f004f72a5d357b87483839500a517da3d1b4ea0a57b9731989d298cccea7d02a AS vault
 ########################## Cross Compile Docker Helper Scripts ##########################
 ## We use the linux/amd64 no matter which Build Platform, since these are all bash scripts
@@ -36,8 +36,7 @@ FROM --platform=linux/amd64 docker.io/tonistiigi/xx@sha256:c64defb9ed5a91eacb37f
 ########################## BUILD IMAGE ##########################
 # hadolint ignore=DL3006
-FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.99.0-slim-trixie AS build
+FROM --platform=$BUILDPLATFORM docker.io/library/rust:1.96.1-slim-trixie AS build
 # hadolint ignore=DL3067
 COPY --from=xx / /
 ARG TARGETARCH
 ARG TARGETVARIANT
@@ -81,7 +80,7 @@ RUN mkdir -pv "${CARGO_HOME}" && \
 RUN USER=root cargo new --bin /app
 WORKDIR /app
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    rustup target add "${CARGO_TARGET}"
 # Copies over *only* your manifests and build files
@@ -96,22 +95,9 @@ ARG DB=sqlite,mysql,postgresql
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
-RUN . /env-cargo && \
+RUN source /env-cargo && \
-    # Configure xx-cargo for target pkg-config and Debian transitive library lookup
+    # Workaround for xx related build issues
    # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
    # https://github.com/dani-garcia/vaultwarden/discussions/7522
    if xx-info is-cross; then \
        XX_RUSTFLAGS="-Clink-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
    fi && \
    # Debian's GCC adds a special fix for cortex-a53 arch's which gets losts when using xx-cargo, which uses clang
    # Checking if the arch is arm64 and adding this extra link-arg should cause this fix to be applied
    # This should fix issues reported when running on a RPi3 which is a Cortex-A35 chip
    # See: https://salsa.debian.org/toolchain-team/gcc/-/blob/master/debian/rules2?pow_referer=#L543-548
    # See: https://github.com/dani-garcia/vaultwarden/issues/7754
    if [ "$(xx-info arch)" = "arm64" ]; then \
        XX_RUSTFLAGS="${XX_RUSTFLAGS} -Clink-arg=-Wl,--fix-cortex-a53-843419"; \
    fi && \
    export XX_RUSTFLAGS && \
    PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}" && \
    find . -not -path "./target*" -delete
@@ -122,28 +108,15 @@ COPY . .
 ARG VW_VERSION
 # Builds again, this time it will be the actual source files being build
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    # Make sure that we actually build the project by updating the src/main.rs timestamp
    # Also do this for build.rs to ensure the version is rechecked
    touch build.rs src/main.rs && \
    # Create a symlink to the binary target folder to easy copy the binary in the final stage
-    # Configure xx-cargo for target pkg-config and Debian transitive library lookup
+    # Workaround for xx related build issues
    # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
    # https://github.com/dani-garcia/vaultwarden/discussions/7522
    if xx-info is-cross; then \
        XX_RUSTFLAGS="-Clink-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
    fi && \
    # Debian's GCC adds a special fix for cortex-a53 arch's which gets losts when using xx-cargo, which uses clang
    # Checking if the arch is arm64 and adding this extra link-arg should cause this fix to be applied
    # This should fix issues reported when running on a RPi3 which is a Cortex-A35 chip
    # See: https://salsa.debian.org/toolchain-team/gcc/-/blob/master/debian/rules2?pow_referer=#L543-548
    # See: https://github.com/dani-garcia/vaultwarden/issues/7754
    if [ "$(xx-info arch)" = "arm64" ]; then \
        XX_RUSTFLAGS="${XX_RUSTFLAGS} -Clink-arg=-Wl,--fix-cortex-a53-843419"; \
    fi && \
    export XX_RUSTFLAGS && \
    PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}" && \
-    if [ "${CARGO_PROFILE}" = "dev" ] ; then \
+    if [[ "${CARGO_PROFILE}" == "dev" ]] ; then \
        ln -vfsr "/app/target/${CARGO_TARGET}/debug" /app/target/final ; \
    else \
        ln -vfsr "/app/target/${CARGO_TARGET}/${CARGO_PROFILE}" /app/target/final ; \
@@ -166,7 +139,6 @@ RUN . /env-cargo && \
 # To uninstall: docker run --privileged --rm tonistiigi/binfmt --uninstall 'qemu-*'
 #
 # We need to add `--platform` here, because of a podman bug: https://github.com/containers/buildah/issues/4742
 # hadolint ignore=DL3065
 FROM --platform=$TARGETPLATFORM docker.io/library/debian:trixie-slim
 ENV ROCKET_PROFILE="release" \
@@ -28,21 +28,8 @@
 #     [docker.io/vaultwarden/web-vault:{{ vault_version | replace('+', '_') }}]
 #
 {% macro xx_cargo_config() -%}
-# Configure xx-cargo for target pkg-config and Debian transitive library lookup
+# Workaround for xx related build issues
    # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
    # https://github.com/dani-garcia/vaultwarden/discussions/7522
    if xx-info is-cross; then \
        XX_RUSTFLAGS="-Clink-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
    fi && \
    # Debian's GCC adds a special fix for cortex-a53 arch's which gets losts when using xx-cargo, which uses clang
    # Checking if the arch is arm64 and adding this extra link-arg should cause this fix to be applied
    # This should fix issues reported when running on a RPi3 which is a Cortex-A35 chip
    # See: https://salsa.debian.org/toolchain-team/gcc/-/blob/master/debian/rules2?pow_referer=#L543-548
    # See: https://github.com/dani-garcia/vaultwarden/issues/7754
    if [ "$(xx-info arch)" = "arm64" ]; then \
        XX_RUSTFLAGS="${XX_RUSTFLAGS} -Clink-arg=-Wl,--fix-cortex-a53-843419"; \
    fi && \
    export XX_RUSTFLAGS && \
    PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}"
 {%- endmacro %}
 FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@{{ vault_image_digest }} AS vault
@@ -65,7 +52,6 @@ FROM --platform=$BUILDPLATFORM {{ build_stage_image[base].arch_image[arch] }} AS
 # hadolint ignore=DL3006
 FROM --platform=$BUILDPLATFORM {{ build_stage_image[base].image }} AS build
 {% if base == "debian" %}
 # hadolint ignore=DL3067
 COPY --from=xx / /
 {% endif %}
 ARG TARGETARCH
@@ -120,12 +106,12 @@ WORKDIR /app
 {% if base == "alpine" %}
 # Environment variables for Cargo on Alpine based builds
-RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \
+RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \
    # Output the current contents of the file
    cat /env-cargo
 {% endif %}
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    rustup target add "${CARGO_TARGET}"
 # Copies over *only* your manifests and build files
@@ -145,7 +131,7 @@ ARG DB=sqlite,mysql,postgresql,enable_mimalloc
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
-RUN . /env-cargo && \
+RUN source /env-cargo && \
 {% if base == "debian" %}
    {{ xx_cargo_config() }} && \
 {% elif base == "alpine" %}
@@ -160,7 +146,7 @@ COPY . .
 ARG VW_VERSION
 # Builds again, this time it will be the actual source files being build
-RUN . /env-cargo && \
+RUN source /env-cargo && \
    # Make sure that we actually build the project by updating the src/main.rs timestamp
    # Also do this for build.rs to ensure the version is rechecked
    touch build.rs src/main.rs && \
@@ -170,7 +156,7 @@ RUN . /env-cargo && \
 {% elif base == "alpine" %}
    cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" && \
 {% endif %}
-    if [ "${CARGO_PROFILE}" = "dev" ] ; then \
+    if [[ "${CARGO_PROFILE}" == "dev" ]] ; then \
        ln -vfsr "/app/target/${CARGO_TARGET}/debug" /app/target/final ; \
    else \
        ln -vfsr "/app/target/${CARGO_TARGET}/${CARGO_PROFILE}" /app/target/final ; \
@@ -193,7 +179,6 @@ RUN . /env-cargo && \
 # To uninstall: docker run --privileged --rm tonistiigi/binfmt --uninstall 'qemu-*'
 #
 # We need to add `--platform` here, because of a podman bug: https://github.com/containers/buildah/issues/4742
 # hadolint ignore=DL3065
 FROM --platform=$TARGETPLATFORM {{ runtime_stage_image[base] }}
 ENV ROCKET_PROFILE="release" \
@@ -3,23 +3,17 @@
 import os
 import argparse
 import json
 import tomllib
 import yaml
 import jinja2
 # Load settings file
-with open('DockerSettings.yaml', 'r', encoding='utf-8') as yaml_file:
+with open("DockerSettings.yaml", 'r') as yaml_file:
 	yaml_data = yaml.safe_load(yaml_file)
 # Extract the rust_version from the rust-toolchain.toml file
 script_dir = os.path.dirname(os.path.abspath(__file__))
 with open(os.path.join(script_dir, '..', 'rust-toolchain.toml'), 'rb') as toolchain_file:
    yaml_data["rust_version"] = tomllib.load(toolchain_file)["toolchain"]["channel"]
 settings_env = jinja2.Environment(
 	loader=jinja2.FileSystemLoader(os.getcwd()),
 )
-settings_yaml = yaml.safe_load(settings_env.get_template('DockerSettings.yaml').render(yaml_data))
+settings_yaml = yaml.safe_load(settings_env.get_template("DockerSettings.yaml").render(yaml_data))
 args_parser = argparse.ArgumentParser()
 args_parser.add_argument('template_file', help='Jinja2 template file to render.')
@@ -13,8 +13,8 @@ path = "src/lib.rs"
 proc-macro = true
 [dependencies]
-quote = "1.0.47"
+quote = "1.0.46"
-syn = "3.0.6"
+syn = "2.0.118"
 [lints]
 workspace = true
@@ -1 +0,0 @@
 ALTER TABLE users ADD COLUMN key_id TEXT;
@@ -1,31 +1,15 @@
-SELECT if (
+-- Dynamically create DROP FOREIGN KEY
-    EXISTS(
+-- Some versions of MySQL or MariaDB might fail if the key doesn't exists
-        SELECT CONSTRAINT_NAME FROM information_schema.table_constraints
+-- This checks if the key exists, and if so, will drop it.
-            WHERE TABLE_SCHEMA = DATABASE()
+SET @drop_sso_fk = IF((SELECT true FROM information_schema.TABLE_CONSTRAINTS WHERE
-                AND TABLE_NAME = 'sso_users'
+    CONSTRAINT_SCHEMA = DATABASE() AND
-                AND CONSTRAINT_TYPE = 'FOREIGN KEY'
+    TABLE_NAME = 'sso_users' AND
-                AND CONSTRAINT_NAME = 'sso_users_ibfk_1'
+    CONSTRAINT_NAME = 'sso_users_ibfk_1' AND
-    )
+    CONSTRAINT_TYPE = 'FOREIGN KEY') = true,
-    ,'ALTER TABLE sso_users DROP FOREIGN KEY `sso_users_ibfk_1`'
+    'ALTER TABLE sso_users DROP FOREIGN KEY sso_users_ibfk_1',
-    ,'SELECT "info: FK sso_users_ibfk_1 does not exist."'
+    'SELECT 1');
-) INTO @drop_stmt;
+PREPARE stmt FROM @drop_sso_fk;
-PREPARE drop_stmt FROM @drop_stmt;
+EXECUTE stmt;
-EXECUTE drop_stmt;
+DEALLOCATE PREPARE stmt;
 SELECT if (
    EXISTS(
        SELECT CONSTRAINT_NAME FROM information_schema.table_constraints
            WHERE TABLE_SCHEMA = DATABASE()
                AND TABLE_NAME = 'sso_users'
                AND CONSTRAINT_TYPE = 'FOREIGN KEY'
                AND CONSTRAINT_NAME = '1'
    )
    ,'ALTER TABLE sso_users DROP FOREIGN KEY `1`'
    ,'SELECT "info: FK sso_users 1 does not exist."'
 ) INTO @drop_stmt;
 PREPARE drop_stmt FROM @drop_stmt;
 EXECUTE drop_stmt;
 DEALLOCATE PREPARE drop_stmt;
 ALTER TABLE sso_users ADD FOREIGN KEY(user_uuid) REFERENCES users(uuid) ON UPDATE CASCADE ON DELETE CASCADE;
@@ -1 +0,0 @@
 ALTER TABLE users ADD COLUMN key_id TEXT;
@@ -1 +0,0 @@
 ALTER TABLE org_policies DROP COLUMN revision_date;
@@ -1,7 +0,0 @@
 -- DATETIME (not TIMESTAMP) to match this repo's convention for revision_date
 -- columns elsewhere, and to avoid MySQL's implicit session-timezone
 -- conversion and 2038 range limit on TIMESTAMP.
 ALTER TABLE org_policies
 ADD COLUMN revision_date DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00';
 UPDATE org_policies SET revision_date = UTC_TIMESTAMP();
@@ -1,3 +0,0 @@
 -- A blob-encrypted cipher keeps all of its content in `data`, up to 500,000 characters, so the
 -- 64 KiB of TEXT is too small. Like upstream, which uses LONGTEXT.
 ALTER TABLE ciphers MODIFY data LONGTEXT NOT NULL;
@@ -1,5 +0,0 @@
 DROP TABLE IF EXISTS user_signature_key_pairs;
 ALTER TABLE users DROP COLUMN signed_public_key;
 ALTER TABLE users DROP COLUMN security_state;
 ALTER TABLE users DROP COLUMN security_version;
@@ -1,14 +0,0 @@
 ALTER TABLE users ADD COLUMN signed_public_key TEXT;
 ALTER TABLE users ADD COLUMN security_state TEXT;
 ALTER TABLE users ADD COLUMN security_version INTEGER;
 CREATE TABLE user_signature_key_pairs (
    uuid                CHAR(36) NOT NULL PRIMARY KEY,
    user_uuid           CHAR(36) NOT NULL UNIQUE,
    signature_algorithm INTEGER  NOT NULL, -- 0 = ed25519, 1 = mldsa44
    signing_key         TEXT     NOT NULL,
    verifying_key       TEXT     NOT NULL,
    created_at          DATETIME NOT NULL,
    updated_at          DATETIME NOT NULL,
    FOREIGN KEY (user_uuid) REFERENCES users (uuid) ON DELETE CASCADE
 );
@@ -1 +0,0 @@
 ALTER TABLE users ADD COLUMN key_id TEXT;
@@ -1 +0,0 @@
 ALTER TABLE org_policies DROP COLUMN revision_date;
@@ -1,9 +0,0 @@
 -- Backfill via `now() AT TIME ZONE 'utc'` rather than a DEFAULT of now():
 -- assigning timestamptz now() into a naive TIMESTAMP column casts through
 -- the server's TimeZone GUC, so a DEFAULT now() would store local wall-clock
 -- instead of UTC on non-UTC servers, unlike every other naive-UTC timestamp
 -- column in this schema.
 ALTER TABLE org_policies
 ADD COLUMN revision_date TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00';
 UPDATE org_policies SET revision_date = (now() AT TIME ZONE 'utc');
@@ -1 +0,0 @@
 -- TEXT has no size limit here, only MySQL needed the change
@@ -1,5 +0,0 @@
 DROP TABLE IF EXISTS user_signature_key_pairs;
 ALTER TABLE users DROP COLUMN signed_public_key;
 ALTER TABLE users DROP COLUMN security_state;
 ALTER TABLE users DROP COLUMN security_version;
@@ -1,13 +0,0 @@
 ALTER TABLE users ADD COLUMN signed_public_key TEXT;
 ALTER TABLE users ADD COLUMN security_state TEXT;
 ALTER TABLE users ADD COLUMN security_version INTEGER;
 CREATE TABLE user_signature_key_pairs (
    uuid                CHAR(36) NOT NULL PRIMARY KEY,
    user_uuid           CHAR(36) NOT NULL UNIQUE REFERENCES users (uuid) ON DELETE CASCADE,
    signature_algorithm INTEGER  NOT NULL, -- 0 = ed25519, 1 = mldsa44
    signing_key         TEXT     NOT NULL,
    verifying_key       TEXT     NOT NULL,
    created_at          TIMESTAMP NOT NULL,
    updated_at          TIMESTAMP NOT NULL
 );
@@ -1 +0,0 @@
 ALTER TABLE users ADD COLUMN key_id TEXT;
@@ -1,6 +0,0 @@
 -- SQLite forbids non-constant defaults in ALTER TABLE ... ADD COLUMN, so add
 -- the column with a constant placeholder and backfill separately.
 ALTER TABLE org_policies
 ADD COLUMN revision_date DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00';
 UPDATE org_policies SET revision_date = CURRENT_TIMESTAMP;
@@ -1 +0,0 @@
 -- TEXT has no size limit here, only MySQL needed the change
@@ -1,5 +0,0 @@
 DROP TABLE IF EXISTS user_signature_key_pairs;
 ALTER TABLE users DROP COLUMN signed_public_key;
 ALTER TABLE users DROP COLUMN security_state;
 ALTER TABLE users DROP COLUMN security_version;
@@ -1,13 +0,0 @@
 ALTER TABLE users ADD COLUMN signed_public_key TEXT;
 ALTER TABLE users ADD COLUMN security_state TEXT;
 ALTER TABLE users ADD COLUMN security_version INTEGER;
 CREATE TABLE user_signature_key_pairs (
    uuid                TEXT     NOT NULL PRIMARY KEY,
    user_uuid           TEXT     NOT NULL UNIQUE REFERENCES users (uuid) ON DELETE CASCADE,
    signature_algorithm INTEGER  NOT NULL, -- 0 = ed25519, 1 = mldsa44
    signing_key         TEXT     NOT NULL,
    verifying_key       TEXT     NOT NULL,
    created_at          DATETIME NOT NULL,
    updated_at          DATETIME NOT NULL
 );
@@ -21,19 +21,11 @@ TEST_USER3=test3
 TEST_USER3_PASSWORD=${TEST_USER3}
 TEST_USER3_MAIL=${TEST_USER3}@yopmail.com
 TEST_USER4=test4
 TEST_USER4_PASSWORD=${TEST_USER4}
 TEST_USER4_MAIL=${TEST_USER4}@yopmail.com
 TEST_USER5=test5
 TEST_USER5_PASSWORD=${TEST_USER5}
 TEST_USER5_MAIL=${TEST_USER5}@yopmail.com
 ###################
 # Keycloak Config #
 ###################
-KC_BOOTSTRAP_ADMIN_USERNAME=admin
+KEYCLOAK_ADMIN=admin
-KC_BOOTSTRAP_ADMIN_PASSWORD=${KC_BOOTSTRAP_ADMIN_USERNAME}
+KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN}
 KC_HTTP_HOST=127.0.0.1
 KC_HTTP_PORT=8080
@@ -47,10 +39,8 @@ DUMMY_AUTHORITY=http://${KC_HTTP_HOST}:${KC_HTTP_PORT}/realms/${DUMMY_REALM}
 ######################
 ROCKET_ADDRESS=0.0.0.0
 ROCKET_PORT=8000
-ROCKET_TLS={certs="/data/ssl/localhost.crt",key="/data/ssl/localhost.key"}
+DOMAIN=http://localhost:${ROCKET_PORT}
 DOMAIN=https://127.0.0.1:${ROCKET_PORT}
 LOG_LEVEL=info,oidcwarden::sso=debug
 SSO_DEBUG_TOKENS=true
 I_REALLY_WANT_VOLATILE_STORAGE=true
 SSO_ENABLED=true
@@ -1,8 +1,8 @@
 # Integration tests
 This allows running integration tests using [Playwright](https://playwright.dev/).
-\
+
-It uses its own [test.env](./test.env) with different ports to not collide with a running dev instance.
+It uses its own `test.env` with different ports to not collide with a running dev instance.
 ## Install
@@ -11,11 +11,11 @@ Databases (`Mariadb`, `Mysql` and `Postgres`) and `Playwright` will run in conta
 ### Running Playwright outside docker
-It's possible to run `Playwright` outside of the container, this remove the need to rebuild the image for each change.
+It is possible to run `Playwright` outside of the container, this removes the need to rebuild the image for each change.
-You'll additionally need `nodejs` then run:
+You will additionally need `nodejs` then run:
 ```bash
-npm ci --ignore-scripts --allow-git=none --allow-remote=none
+npm ci --ignore-scripts
 npx playwright install-deps
 npx playwright install firefox
 ```
@@ -62,10 +62,10 @@ DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env run Pl
 ### Keep services running
-If you want you can keep the DB and Keycloak running (states are not impacted by the tests):
+If you want you can keep the DB and Keycloak runnning (states are not impacted by the tests):
 ```bash
-PW_KEEP_SERVICE_RUNNING=true npx playwright test
+PW_KEEP_SERVICE_RUNNNING=true npx playwright test
 ```
 ### Running specific tests
@@ -77,7 +77,7 @@ DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env run Pl
 DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env run Playwright test --project=sqlite login
 ```
-To run only a specific test (It might fail if it has dependency):
+To run only a specifc test (It might fail if it has dependency):
 ```bash
 DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env run Playwright test --project=sqlite -g "Account creation"
@@ -92,7 +92,7 @@ This does not start the server, you will need to start it manually.
 ```bash
 DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env up Vaultwarden
-npx playwright codegen "https://127.0.0.1:8000" --ignore-https-errors
+npx playwright codegen "http://127.0.0.1:8003"
 ```
 ## Override web-vault
@@ -112,11 +112,12 @@ You can check the result running:
 DOCKER_BUILDKIT=1 docker compose --profile playwright --env-file test.env up Vaultwarden
 ```
-Then check `https://127.0.0.1:8003/admin/diagnostics` with `admin`.
+Then check `http://127.0.0.1:8003/admin/diagnostics` with `admin`.
 # OpenID Connect test setup
-Additionally this `docker-compose` template allow to run locally `Vaultwarden`, [Keycloak](https://www.keycloak.org/) and [Maildev](https://github.com/timshel/maildev) to test OIDC.
+Additionally this `docker-compose` template allows to run locally Vaultwarden,
 [Keycloak](https://www.keycloak.org/) and [Maildev](https://github.com/timshel/maildev) to test OIDC.
 ## Setup
@@ -130,17 +131,18 @@ Then start the stack (the `profile` is required to run `Vaultwarden`) :
 ```bash
 > docker compose --profile vaultwarden --env-file .env up
 ....
-keycloakSetup_1  | Logging into https://127.0.0.1:8080 as user admin of realm master
+keycloakSetup_1  | Logging into http://127.0.0.1:8080 as user admin of realm master
 keycloakSetup_1  | Created new realm with id 'test'
 keycloakSetup_1  | 74af4933-e386-4e64-ba15-a7b61212c45e
 oidc_keycloakSetup_1 exited with code 0
 ```
-Wait until `oidc_keycloakSetup_1 exited with code 0` which indicate the correct setup of the Keycloak realm, client and user (It's normal for this container to stop once the configuration is done).
+Wait until `oidc_keycloakSetup_1 exited with code 0` which indicates the correct setup of the Keycloak realm, client and user
 (It is normal for this container to stop once the configuration is done).
 Then you can access :
- `Vaultwarden` on https://0.0.0.0:8000 with the default user `test@yopmail.com/test`.
+- `Vaultwarden` on http://0.0.0.0:8000 with the default user `test@yopmail.com/test`.
 - `Keycloak` on http://0.0.0.0:8080/admin/master/console/ with the default user `admin/admin`
 - `Maildev` on http://0.0.0.0:1080
@@ -169,7 +171,7 @@ docker compose --profile vaultwarden --env-file .env build VaultwardenPrebuild V
 All configuration for `keycloak` / `Vaultwarden` / `keycloak_setup.sh` can be found in [.env](.env.template).
 The content of the file will be loaded as environment variables in all containers.
- `keycloak` [configuration](https://www.keycloak.org/server/all-config) include `KC_BOOTSTRAP_ADMIN_USERNAME` / `KC_BOOTSTRAP_ADMIN_PASSWORD` and any variable prefixed `KC_` ([more information](https://www.keycloak.org/server/configuration#_example_configuring_the_db_url_host_parameter)).
+- `keycloak` [configuration](https://www.keycloak.org/server/all-config) includes `KEYCLOAK_ADMIN` / `KEYCLOAK_ADMIN_PASSWORD` and any variable prefixed `KC_` ([more information](https://www.keycloak.org/server/configuration#_example_configuring_the_db_url_host_parameter)).
 - All `Vaultwarden` configuration can be set (EX: `SMTP_*`)
 ## Cleanup
@@ -17,7 +17,7 @@ done
 set -e
-kcadm.sh config credentials --server "http://${KC_HTTP_HOST}:${KC_HTTP_PORT}" --realm master --user "$KC_BOOTSTRAP_ADMIN_USERNAME" --password "$KC_BOOTSTRAP_ADMIN_PASSWORD" --client admin-cli
+kcadm.sh config credentials --server "http://${KC_HTTP_HOST}:${KC_HTTP_PORT}" --realm master --user "$KEYCLOAK_ADMIN" --password "$KEYCLOAK_ADMIN_PASSWORD" --client admin-cli
 kcadm.sh create realms -s realm="$TEST_REALM" -s enabled=true -s "accessTokenLifespan=600"
 kcadm.sh create clients -r test -s "clientId=$SSO_CLIENT_ID" -s "secret=$SSO_CLIENT_SECRET" -s "redirectUris=[\"$DOMAIN/*\"]" -i
@@ -39,6 +39,6 @@ kcadm.sh create realms -s realm="$DUMMY_REALM" -s enabled=true -s "accessTokenLi
 # THEN in another terminal:
 # docker exec -it keycloakSetup-dev /bin/bash
 # export PATH=$PATH:/opt/keycloak/bin
-# kcadm.sh config credentials --server "http://${KC_HTTP_HOST}:${KC_HTTP_PORT}" --realm master --user "$KC_BOOTSTRAP_ADMIN_USERNAME" --password "$KC_BOOTSTRAP_ADMIN_PASSWORD" --client admin-cli
+# kcadm.sh config credentials --server "http://${KC_HTTP_HOST}:${KC_HTTP_PORT}" --realm master --user "$KEYCLOAK_ADMIN" --password "$KEYCLOAK_ADMIN_PASSWORD" --client admin-cli
 # ENJOY
 # Doc: https://wjw465150.gitbooks.io/keycloak-documentation/content/server_admin/topics/admin-cli.html
@@ -28,7 +28,7 @@ RUN mkdir /playwright
 WORKDIR /playwright
 COPY package.json package-lock.json .
-RUN npm ci --ignore-scripts --allow-git=none --allow-remote=none && npx playwright install-deps && npx playwright install firefox
+RUN npm ci --ignore-scripts && npx playwright install-deps && npx playwright install firefox
 COPY docker-compose.yml test.env ./
 COPY compose ./compose
@@ -35,7 +35,6 @@ WORKDIR /
 COPY --from=prebuilt /start.sh .
 COPY --from=prebuilt /vaultwarden .
 COPY --from=build /data ./data
 COPY --from=build /web-vault ./web-vault
 ENTRYPOINT ["/start.sh"]
@@ -22,14 +22,3 @@ if [[ ! -z "$REPO_URL" ]] && [[ ! -z "$COMMIT_HASH" ]] ; then
    mv build /web-vault
 fi
 # Lower the KDF iterations default for faster tests.
 sed -i 's/(6e5,2e6,6e5)/(1e5,2e6,1e5)/' /web-vault/app/main.*.js
 # Generate a self signed cert
 mkdir -p /data/ssl; cd /data/ssl
 openssl req -x509 -out localhost.crt -keyout localhost.key \
  -newkey rsa:2048 -nodes -sha256 \
  -subj '/CN=localhost' -extensions EXT -config <( \
   printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
@@ -24,15 +24,12 @@ services:
    environment:
      - ADMIN_TOKEN
      - DATABASE_URL
      - CLIENT_SUPPRESS_ONBOARDING
      - EMAIL_2FA_AUTO_FALLBACK
      - I_REALLY_WANT_VOLATILE_STORAGE
      - LOG_LEVEL
      - LOGIN_RATELIMIT_MAX_BURST
      - SMTP_HOST
      - SMTP_FROM
      - SMTP_DEBUG
      - SSO_AUTH_ONLY_NOT_SESSION
      - SSO_DEBUG_TOKENS
      - SSO_ENABLED
      - SSO_FRONTEND
@@ -61,7 +58,7 @@ services:
  Mariadb:
    profiles: ["playwright"]
    container_name: playwright_mariadb
-    image: mariadb:12.2.2
+    image: mariadb:11.2.4
    env_file: test.env
    healthcheck:
      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
@@ -73,7 +70,7 @@ services:
  Mysql:
    profiles: ["playwright"]
    container_name: playwright_mysql
-    image: mysql:9.7.0
+    image: mysql:8.4.1
    env_file: test.env
    healthcheck:
      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
@@ -85,7 +82,7 @@ services:
  Postgres:
    profiles: ["playwright"]
    container_name: playwright_postgres
-    image: postgres:18.4
+    image: postgres:16.3
    env_file: test.env
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@@ -97,7 +94,7 @@ services:
  Maildev:
    profiles: ["vaultwarden", "maildev"]
    container_name: maildev
-    image: timshel/maildev:3.2.19
+    image: timshel/maildev:3.0.4
    ports:
      - ${SMTP_PORT}:1025
      - 1080:1080
@@ -105,7 +102,7 @@ services:
  Keycloak:
    profiles: ["keycloak", "vaultwarden"]
    container_name: keycloak-${ENV:-dev}
-    image: quay.io/keycloak/keycloak:26.6.2
+    image: quay.io/keycloak/keycloak:26.3.4
    network_mode: "host"
    command:
      - start-dev
@@ -115,12 +112,12 @@ services:
    profiles: ["keycloak", "vaultwarden"]
    container_name: keycloakSetup-${ENV:-dev}
    image: keycloak_setup-${ENV:-dev}
    network_mode: "host"
    build:
      context: compose/keycloak
      dockerfile: Dockerfile
      args:
-        KEYCLOAK_VERSION: 26.6.2
+        KEYCLOAK_VERSION: 26.3.4
    network_mode: "host"
    depends_on:
      - Keycloak
    restart: "no"
@@ -1,4 +1,4 @@
-import { type FullConfig } from '@playwright/test';
+import { firefox, type FullConfig } from '@playwright/test';
 import { execSync } from 'node:child_process';
 import fs from 'fs';
@@ -207,7 +207,7 @@ export async function startVault(browser: Browser, testInfo: TestInfo, env = {},
 }
 export async function stopVault(force: boolean = false) {
-    if( force === false && process.env.PW_KEEP_SERVICE_RUNNING === "true" ) {
+    if( force === false && process.env.PW_KEEP_SERVICE_RUNNNING === "true" ) {
        console.log(`Keep vaultwarden running on: ${process.env.DOMAIN}`);
    } else {
        console.log(`Vaultwarden stopping`);
@@ -231,7 +231,6 @@ export async function checkNotification(page: Page, hasText: string) {
 }
 export async function cleanLanding(page: Page) {
    await page.context().clearCookies();
    await page.goto('/', { waitUntil: 'domcontentloaded' });
    await expect(page.getByRole('button').nth(0)).toBeVisible();
@@ -249,3 +248,15 @@ export async function logout(test: Test, page: Page, user: { name: string }) {
        await expect(page.getByRole('heading', { name: 'Log in' })).toBeVisible();
    });
 }
 export async function ignoreExtension(page: Page) {
    await page.waitForLoadState('domcontentloaded');
    try {
        await page.getByRole('button', { name: 'Add it later' }).click({timeout: 5_000});
        await page.getByRole('link', { name: 'Skip to web app' }).click();
    } catch (error) {
        console.log('Extension setup not visible. Continuing');
    }
 }
@@ -8,14 +8,14 @@
    "author": "",
    "license": "ISC",
    "devDependencies": {
-        "@playwright/test": "1.60.0",
+        "@playwright/test": "1.56.1",
-        "dotenv": "17.4.2",
+        "dotenv": "17.2.3",
-        "dotenv-expand": "13.0.0",
+        "dotenv-expand": "12.0.3",
-        "maildev": "npm:@timshel_npm/maildev@3.2.19"
+        "maildev": "npm:@timshel_npm/maildev@3.2.5"
    },
    "dependencies": {
-        "mysql2": "3.22.3",
+        "mysql2": "3.15.3",
-        "otpauth": "9.5.1",
+        "otpauth": "9.4.1",
-        "pg": "8.21.0"
+        "pg": "8.16.3"
    }
 }
@@ -25,12 +25,10 @@ export default defineConfig({
    /* Long global timeout for complex tests
     * But short action/nav/expect timeouts to fail on specific step (raise locally if not enough).
     */
-    timeout: 240 * 1000,
+    timeout: 120 * 1000,
-    actionTimeout: 40 * 1000,
+    actionTimeout: 20 * 1000,
-    navigationTimeout: 40 * 1000,
+    navigationTimeout: 20 * 1000,
-    expect: { timeout: 40 * 1000 },
+    expect: { timeout: 20 * 1000 },
    "permissions": ["clipboard-read"],
    /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
    use: {
@@ -39,10 +37,6 @@ export default defineConfig({
        browserName: 'firefox',
        locale: 'en-GB',
        timezoneId: 'Europe/London',
        ignoreHTTPSErrors: true,
        launchOptions: {
            args: ['--ignore-certificate-errors']
        },
        /* Always collect trace (other values add random test failures) See https://playwright.dev/docs/trace-viewer */
        trace: 'on',
@@ -10,7 +10,7 @@ DOCKER_BUILDKIT=1
 #####################
 # Playwright Config #
 #####################
-PW_KEEP_SERVICE_RUNNING=${PW_KEEP_SERVICE_RUNNING:-false}
+PW_KEEP_SERVICE_RUNNNING=${PW_KEEP_SERVICE_RUNNNING:-false}
 PW_SMTP_FROM=vaultwarden@playwright.test
 #####################
@@ -38,8 +38,8 @@ TEST_USER3_MAIL=${TEST_USER3}@example.com
 ###################
 # Keycloak Config #
 ###################
-KC_BOOTSTRAP_ADMIN_USERNAME=admin
+KEYCLOAK_ADMIN=admin
-KC_BOOTSTRAP_ADMIN_PASSWORD=${KC_BOOTSTRAP_ADMIN_USERNAME}
+KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN}
 KC_HTTP_HOST=127.0.0.1
 KC_HTTP_PORT=8081
@@ -52,12 +52,10 @@ DUMMY_AUTHORITY=http://${KC_HTTP_HOST}:${KC_HTTP_PORT}/realms/${DUMMY_REALM}
 # Vaultwarden Config #
 ######################
 ROCKET_PORT=8003
-ROCKET_TLS={certs="/data/ssl/localhost.crt",key="/data/ssl/localhost.key"}
+DOMAIN=http://localhost:${ROCKET_PORT}
 DOMAIN=https://127.0.0.1:${ROCKET_PORT}
 LOG_LEVEL=info,oidcwarden::sso=debug
 LOGIN_RATELIMIT_MAX_BURST=100
 ADMIN_TOKEN=admin
 CLIENT_SUPPRESS_ONBOARDING=true
 SMTP_SECURITY=off
 SMTP_PORT=${MAILDEV_SMTP_PORT}
@@ -1,8 +1,6 @@
 import { test, expect, type TestInfo } from '@playwright/test';
 import * as utils from "../global-utils";
 import * as orgs from './setups/orgs';
 import { createAccount } from './setups/user';
 let users = utils.loadEnv();
@@ -18,12 +16,20 @@ test.afterAll('Teardown', async ({}) => {
 test('Create', async ({ page }) => {
    await createAccount(test, page, users.user1);
-    await orgs.create(test, page, 'New organisation');
+    await test.step('Create Org', async () => {
        await page.getByRole('link', { name: 'New organisation' }).click();
        await page.getByLabel('Organisation name (required)').fill('Test');
        await page.getByRole('button', { name: 'Submit' }).click();
        await page.locator('div').filter({ hasText: 'Members' }).nth(2).click();
        await utils.checkNotification(page, 'Organisation created');
    });
    await test.step('Create Collection', async () => {
-        await page.getByRole('button', { name: 'New', exact: true }).click();
+        await page.getByRole('link', { name: 'Collections' }).click();
        await page.getByRole('button', { name: 'New' }).click();
        await page.getByRole('menuitem', { name: 'Collection' }).click();
-        await page.getByRole('textbox', { name: 'Name * (required)', exact: true }).fill('RandomCollec');
+        await page.getByLabel('Name (required)').fill('RandomCollec');
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'Created collection RandomCollec');
        await expect(page.getByRole('button', { name: 'RandomCollec' })).toBeVisible();
@@ -1,56 +0,0 @@
 import { test, expect, type Page, type TestInfo } from '@playwright/test';
 import * as OTPAuth from "otpauth";
 import * as utils from "../global-utils";
 import { createAccount, logUser } from './setups/user';
 import { activateTOTP, disableTOTP } from './setups/2fa';
 let users = utils.loadEnv();
 let totp;
 test.beforeAll('Setup', async ({ browser }, testInfo: TestInfo) => {
    await utils.startVault(browser, testInfo, {});
 });
 test.afterAll('Teardown', async ({}) => {
    utils.stopVault();
 });
 test('Change Key settings', async ({ page }) => {
    await createAccount(test, page, users.user1);
    await test.step('Change SHA-256 Iterations', async () => {
        await page.getByRole('button', { name: 'Toggle collapse Settings' }).click();
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Keys' }).click();
        await page.getByRole('spinbutton', { name: 'KDF iterations * (required)'}).fill('700000');
        await page.getByRole('button', { name: 'Update encryption settings' }).click();
        await page.getByRole('textbox', { name: 'Master password * (required)' }).fill(users.user1.password);
        await page.getByRole('button', { name: 'Update settings' }).click();
        await page.getByRole('heading', { name: 'Log in' }).click();
    });
    await logUser(test, page, users.user1);
    await test.step('Switch to Argon2', async () => {
        await page.getByRole('button', { name: 'Toggle collapse Settings' }).click();
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Keys' }).click();
        await page.locator('.ng-arrow-wrapper').click();
        await page.getByText('Argon2id').click();
        await page.getByRole('spinbutton', { name: 'KDF memory (MB) * (required)'}).fill('16');
        await page.getByRole('spinbutton', { name: 'KDF iterations * (required)'}).fill('2');
        await page.getByRole('spinbutton', { name: 'KDF parallelism * (required)'}).fill('1');
        await page.getByRole('button', { name: 'Update encryption settings' }).click();
        await page.getByRole('textbox', { name: 'Master password * (required)' }).fill(users.user1.password);
        await page.getByRole('button', { name: 'Update settings' }).click();
        await page.getByRole('heading', { name: 'Log in' }).click();
    });
    await logUser(test, page, users.user1);
 });
@@ -1,131 +0,0 @@
 import { test, expect, type Page, type TestInfo, Test } from '@playwright/test';
 import { MailDev } from 'maildev';
 import * as utils from "../global-utils";
 import { createAccount, logUser } from './setups/user';
 import { activateTOTP } from './setups/2fa';
 let users = utils.loadEnv();
 let mailserver;
 test.beforeAll('Setup', async ({ browser }, testInfo: TestInfo) => {
    mailserver = new MailDev({
        port: process.env.MAILDEV_SMTP_PORT,
        web: { port: process.env.MAILDEV_HTTP_PORT },
    })
    await mailserver.listen();
    await utils.startVault(browser, testInfo, {
        SMTP_HOST: process.env.MAILDEV_HOST,
        SMTP_FROM: process.env.PW_SMTP_FROM,
    });
 });
 test.afterAll('Teardown', async ({}) => {
    utils.stopVault();
    if( mailserver ){
        await mailserver.close();
    }
 });
 async function emergencyAccess(test: Test, page: Page, user: { name: string }) {
    await test.step('Navigate', async () => {
        await page.getByRole('button', { name: user.name }).click();
        await page.getByRole('menuitem', { name: 'Account settings' }).click();
        await page.getByRole('link', { name: 'Emergency access' }).click();
        await expect(page.locator('#main-content').getByText('Emergency access', { exact: true })).toBeVisible();
    });
 }
 test('Emergency access', async ({ browser, page }) => {
    const context2 = await browser.newContext();
    const page2 = await context2.newPage();
    const mailBuffer = mailserver.buffer(users.user1.email);
    const mailBuffer2 = mailserver.buffer(users.user2.email);
    await createAccount(test, page, users.user1);
    await createAccount(test, page2, users.user2);
    await test.step('Add test2', async () => {
        await emergencyAccess(test, page, users.user1);
        await page.getByRole('button', { name: 'Add emergency contact' }).click();
        await page.getByRole('textbox', { name: 'Email * (required)' }).fill(users.user2.email);
        await page.getByRole('radio', { name: 'Takeover Can reset your' }).check();
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'User(s) invited');
    });
    await test.step('Accept', async () => {
        const email = await mailBuffer2.expect((m) => m.subject === "Emergency access for " + users.user1.name);
        const pageE = await context2.newPage();
        await pageE.setContent(email.html);
        const link = await pageE.getByTestId("emergency").getAttribute("href");
        await pageE.close();
        await page2.goto(link);
        await utils.checkNotification(page2, 'Invitation accepted');
    });
    await test.step('Confirm', async () => {
        await emergencyAccess(test, page, users.user1);
        await expect(page.locator('#main-content').getByText('Needs confirmation')).toBeVisible();
        await page.getByRole('button', { name: 'Options' }).click();
        await page.getByRole('menuitem', { name: 'Confirm' }).click();
        await page.getByRole('button', { name: 'Confirm' }).click();
        await utils.checkNotification(page, users.user2.name + ' confirmed');
        await mailBuffer2.expect((m) => m.subject === "Emergency access contact for " + users.user1.name + " confirmed");
    });
    await test.step('Request', async () => {
        await emergencyAccess(test, page2, users.user2);
        await page2.getByRole('button', { name: 'Options' }).click();
        await page2.getByRole('menuitem', { name: 'Request Access' }).click();
        await page2.getByRole('button', { name: 'Request Access' }).click();
        await utils.checkNotification(page2, 'Emergency access requested');
        await mailBuffer.expect((m) => m.subject === "Emergency access request by " + users.user2.name + " initiated");
    });
    await test.step('Approved', async () => {
        await emergencyAccess(test, page, users.user1);
        await page.getByRole('button', { name: 'Options' }).click();
        await page.getByRole('menuitem', { name: 'Approve' }).click();
        await page.getByRole('button', { name: 'Approve' }).click();
        await utils.checkNotification(page, 'Emergency access approved');
        await mailBuffer2.expect((m) => m.subject === "Emergency access request for " + users.user1.name + " approved");
    });
    await activateTOTP(test, page, users.user1);
    let newPassword = "TotoNewPassword";
    await test.step('Access', async () => {
        await emergencyAccess(test, page2, users.user2);
        await page2.getByRole('button', { name: 'Options' }).click();
        await page2.getByRole('menuitem', { name: 'Takeover' }).click();
        await page2.getByRole('textbox', { name: 'New master password * (required)', exact: true }).fill(newPassword);
        await page2.getByRole('textbox', { name: 'Confirm new master password' }).fill(newPassword);
        await page2.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page2, 'Password reset for ' + users.user1.name);
    });
    await test.step('Changed no 2fa', async () => {
        users.user1.password = newPassword;
        await logUser(test, page, users.user1);
    });
    await test.step('Reject', async () => {
        await emergencyAccess(test, page, users.user1);
        await page.getByRole('button', { name: 'Options' }).click();
        await page.getByRole('menuitem', { name: 'Reject' }).click();
        await utils.checkNotification(page, 'Emergency access rejected');
        await mailBuffer2.expect((m) => m.subject === "Emergency access request to " + users.user1.name + " rejected");
    });
    await test.step('Remove', async () => {
        await page.getByRole('button', { name: 'Options' }).click();
        await page.getByRole('menuitem', { name: 'Remove' }).click();
        await page.getByRole('button', { name: 'Yes' }).click();
        await utils.checkNotification(page, 'Removed user ' + users.user2.name);
        await expect(page.getByText('You have not added any emergency contacts')).toBeVisible();
    });
 });
@@ -41,10 +41,13 @@ test('Account creation', async ({ page }) => {
 test('Login', async ({ context, page }) => {
    const mailBuffer = mailserver.buffer(users.user1.email);
-    await logUser(test, page, users.user1, { mailBuffer });
+    await logUser(test, page, users.user1, mailBuffer);
    await test.step('verify email', async () => {
-        await page.getByRole('button', { name: "Send email" }).click();
+        await page.getByText('Verify your account\'s email').click();
        await expect(page.getByText('Verify your account\'s email')).toBeVisible();
        await page.getByRole('button', { name: 'Send email' }).click();
        await utils.checkNotification(page, 'Check your email inbox for a verification link');
        const verify = await mailBuffer.expect((m) => m.subject === "Verify Your Email");
@@ -75,10 +78,26 @@ test('Activate 2fa', async ({ page }) => {
 test('2fa', async ({ page }) => {
    const emails = mailserver.buffer(users.user1.email);
-    await logUser(test, page, users.user1, {
+    await test.step('login', async () => {
-        mailBuffer: emails,
+        await page.goto('/');
-        mail2fa: true,
+
-    });
+        await page.getByLabel(/Email address/).fill(users.user1.email);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByLabel('Master password').fill(users.user1.password);
        await page.getByRole('button', { name: 'Log in with master password' }).click();
        await expect(page.getByRole('heading', { name: 'Verify your Identity' })).toBeVisible();
        const code = await retrieveEmailCode(test, page, emails);
        await page.getByLabel(/Verification code/).fill(code);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByRole('button', { name: 'Add it later' }).click();
        await page.getByRole('link', { name: 'Skip to web app' }).click();
        await expect(page).toHaveTitle(/Vaults/);
    })
    await disableEmail(test, page, users.user1);
    emails.close();
 });
@@ -3,7 +3,7 @@ import * as OTPAuth from "otpauth";
 import * as utils from "../global-utils";
 import { createAccount, logUser } from './setups/user';
-import { activateTOTP, disableTOTP, recoveryCodes } from './setups/2fa';
+import { activateTOTP, disableTOTP } from './setups/2fa';
 let users = utils.loadEnv();
 let totp;
@@ -31,42 +31,21 @@ test('Authenticator 2fa', async ({ page }) => {
    await utils.logout(test, page, users.user1);
-    await logUser(test, page, users.user1, { totp });
+    await test.step('login', async () => {
        let timestamp = Date.now(); // Needed to use the next token
        timestamp = timestamp + (totp.period - (Math.floor(timestamp / 1000) % totp.period) + 1) * 1000;
        await page.getByLabel(/Email address/).fill(users.user1.email);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByLabel('Master password').fill(users.user1.password);
        await page.getByRole('button', { name: 'Log in with master password' }).click();
        await expect(page.getByRole('heading', { name: 'Verify your Identity' })).toBeVisible();
        await page.getByLabel(/Verification code/).fill(totp.generate({timestamp}));
        await page.getByRole('button', { name: 'Continue' }).click();
        await expect(page).toHaveTitle(/Vaultwarden Web/);
    });
    await disableTOTP(test, page, users.user1);
 });
 test('Recovery codes', async ({ context, page }) => {
    await logUser(test, page, users.user1);
    await activateTOTP(test, page, users.user1);
    let recovery = await recoveryCodes(test, page, users.user1);
    await utils.logout(test, page, users.user1);
    await test.step('login', async () => {
        await page.getByLabel(/Email address/).fill(users.user1.email);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user1.password);
        await page.getByRole('button', { name: 'Log in', exact: true }).click();
        await expect(page.getByRole('heading', { name: 'Verify your Identity' })).toBeVisible();
        await expect(page).toHaveTitle(/Vaultwarden Web/);
        const newPagePromise = context.waitForEvent('page');
        await page.getByRole('button', { name: 'Use your recovery code' }).click();
        const newPage = await newPagePromise;
        const tabs = context.pages();
        await tabs[1].bringToFront();
        await expect(tabs[1].getByRole('heading', { name: 'Recover account two-step login' })).toBeVisible();
        await tabs[1].getByRole('textbox', { name: 'Email address * (required)' }).fill(users.user1.email);
        await tabs[1].getByRole('textbox', { name: 'Master password * (required)' }).fill(users.user1.password);
        await tabs[1].getByRole('textbox', { name: 'Recovery code * (required)' }).fill(recovery);
        await tabs[1].getByRole('button', { name: 'Submit' }).click();
        await expect(tabs[1]).toHaveTitle(/Two-step login/);
    });
 });
@@ -4,7 +4,6 @@ import { MailDev } from 'maildev';
 import * as utils from '../global-utils';
 import * as orgs from './setups/orgs';
 import { createAccount, logUser } from './setups/user';
 import { activateTOTP } from './setups/2fa';
 let users = utils.loadEnv();
@@ -21,7 +20,6 @@ test.beforeAll('Setup', async ({ browser }, testInfo: TestInfo) => {
    await utils.startVault(browser, testInfo, {
        SMTP_HOST: process.env.MAILDEV_HOST,
        SMTP_FROM: process.env.PW_SMTP_FROM,
        EMAIL_2FA_AUTO_FALLBACK: "true",
    });
    mail1Buffer = mailServer.buffer(users.user1.email);
@@ -47,7 +45,7 @@ test('Invite users', async ({ page }) => {
        await orgs.policies(test, page, 'Test');
        await page.getByRole('button', { name: 'Account recovery' }).click();
        await page.getByRole('checkbox', { name: 'Turn on' }).check();
-        await page.getByRole('checkbox', { name: 'Automatically enroll new' }).check();
+        await page.getByRole('checkbox', { name: 'Require new members' }).check();
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'Edited policy Account recovery');
    });
@@ -68,16 +66,18 @@ test('invited with new account', async ({ page }) => {
        await page.goto(link);
        await expect(page).toHaveTitle(/Create account | Vaultwarden Web/);
-        // await page.getByLabel('Name').fill(users.user2.name);
+        //await page.getByLabel('Name').fill(users.user2.name);
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user2.password);
+        await page.getByLabel('Master password (required)', { exact: true }).fill(users.user2.password);
-        await page.getByRole('textbox', { name: 'Confirm master password * (' }).fill(users.user2.password);
+        await page.getByLabel('Confirm master password (').fill(users.user2.password);
        await page.getByRole('button', { name: 'Create account' }).click();
        await utils.checkNotification(page, 'Your new account has been created');
        await utils.checkNotification(page, 'Invitation accepted');
        await utils.ignoreExtension(page);
        // Redirected to the vault
        await expect(page).toHaveTitle('Vaults | Vaultwarden Web');
        // await utils.checkNotification(page, 'You have been logged in!');
        await utils.checkNotification(page, 'Successfully accepted your invitation');
    });
    await test.step('Check mails', async () => {
@@ -100,19 +100,21 @@ test('invited with existing account', async ({ page }) => {
    await page.getByRole('button', { name: 'Continue' }).click();
    // Unlock page
-    await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user3.password);
+    await page.getByLabel('Master password').fill(users.user3.password);
-    await page.getByRole('button', { name: 'Log in', exact: true }).click();
+    await page.getByRole('button', { name: 'Log in with master password' }).click();
    await utils.checkNotification(page, 'Invitation accepted');
    await utils.ignoreExtension(page);
    // We are now in the default vault page
    await expect(page).toHaveTitle(/Vaultwarden Web/);
    await utils.checkNotification(page, 'Successfully accepted your invitation');
    await mail3Buffer.expect((m) => m.subject === 'New Device Logged In From Firefox');
    await mail1Buffer.expect((m) => m.subject.includes('Invitation to Test accepted'));
 });
 test('Confirm invited user', async ({ page }) => {
-    await logUser(test, page, users.user1, { mailBuffer: mail1Buffer });
+    await logUser(test, page, users.user1, mail1Buffer);
    await orgs.members(test, page, 'Test');
    await orgs.confirm(test, page, 'Test', users.user2.email);
@@ -121,30 +123,25 @@ test('Confirm invited user', async ({ page }) => {
 });
 test('Organization is visible', async ({ page }) => {
-    await logUser(test, page, users.user2, { mailBuffer: mail2Buffer });
+    await logUser(test, page, users.user2, mail2Buffer);
    await page.getByRole('button', { name: 'vault: Test', exact: true }).click();
    await expect(page.getByLabel('Filter: Default collection')).toBeVisible();
 });
 test('Recover user password', async ({ page }) => {
-    await logUser(test, page, users.user2, { mailBuffer: mail2Buffer });
+    await logUser(test, page, users.user1, mail1Buffer);
    await activateTOTP(test, page, users.user2);
    await logUser(test, page, users.user1, { mailBuffer: mail1Buffer });
    let newPassword = "TotoNewPassword";
    await orgs.members(test, page, 'Test');
-    await test.step(`Recover ${users.user2.email}`, async () => {
+    await test.step(`Rrcover ${users.user2.email}`, async () => {
        await expect(page.getByRole('heading', { name: 'Members' })).toBeVisible();
        await page.getByRole('row').filter({hasText: users.user2.email}).getByLabel('Options').click();
        await page.getByRole('menuitem', { name: 'Recover account' }).click();
-        await page.getByRole('textbox', { name: 'New master password * (required)', exact: true }).fill(newPassword);
+        await page.getByRole('textbox', { name: 'New master password (required)', exact: true }).fill(newPassword);
-        await page.getByRole('textbox', { name: 'Confirm new master password * (' }).fill(newPassword);
+        await page.getByRole('textbox', { name: 'Confirm new master password (' }).fill(newPassword);
-        await page.getByRole('checkbox', { name: 'Reset two-step login' }).check();
+         await page.getByRole('button', { name: 'Save' }).click();
-        await page.getByRole('button', { name: 'Save' }).click();
+        await utils.checkNotification(page, 'Password reset success');
        await utils.checkNotification(page, 'Account recovery success');
        await mail2Buffer.expect((m) => m.subject.includes('Admin account recovery from Test organization'));
    });
    let user2 = {
@@ -152,9 +149,5 @@ test('Recover user password', async ({ page }) => {
        name: users.user2.name,
        password: newPassword,
    };
-    await logUser(test, page, user2, {
+    await logUser(test, page, user2, mail2Buffer);
        mailBuffer: mail2Buffer,
        mail2fa: true,
        notNewDevice: true,
    });
 });
@@ -1,110 +0,0 @@
 import { test, expect, type Page, type TestInfo } from '@playwright/test';
 import * as OTPAuth from "otpauth";
 import * as utils from "../global-utils";
 import { createAccount, logUser } from './setups/user';
 let users = utils.loadEnv();
 let totp;
 test.beforeAll('Setup', async ({ browser }, testInfo: TestInfo) => {
    await utils.startVault(browser, testInfo, {});
    const context = await browser.newContext();
    const page = await context.newPage();
    await createAccount(test, page, users.user1);
    await context.close();
 });
 test.afterAll('Teardown', async ({}) => {
    utils.stopVault();
 });
 test('Password', async ({ context, page }, testInfo: TestInfo) => {
    const label = 'Test Password';
    await logUser(test, page, users.user1);
    await test.step('Create password entry', async () => {
        await page.getByRole('button', { name: 'New item' }).click();
        await page.getByRole('textbox', { name: 'Item name * (required)' }).fill(label);
        await page.getByRole('textbox', { name: 'Username' }).fill(users.user1.name);
        await page.getByRole('textbox', { name: 'Password' }).fill(users.user1.password);
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'Item added');
        await page.getByRole('button', { name: 'Close' }).click();
    });
    // Log again
    await logUser(test, page, users.user1);
    await test.step('Check', async () => {
        await page.getByRole('row').filter({ hasText: label }).getByRole('button', { name: label }).click();
        await page.getByTestId('copy-username').click();
        await utils.checkNotification(page, 'Username copied');
        expect(await page.evaluate(() => navigator.clipboard.readText())).toBe(users.user1.name)
        await page.getByTestId('copy-password').click();
        await utils.checkNotification(page, 'Password copied');
        expect(await page.evaluate(() => navigator.clipboard.readText())).toBe(users.user1.password)
        await page.getByRole('button', { name: 'Close' }).click();
    });
    await test.step('Delete', async () => {
        await page.getByRole('row').filter({ hasText: label }).getByLabel('Options').click();
        await page.getByRole('menuitem', { name: 'Delete' }).click();
        await page.getByRole('button', { name: 'Yes' }).click();
        await utils.checkNotification(page, 'Item sent to bin');
    });
    // Log again
    await logUser(test, page, users.user1);
    await test.step('Deleted', async () => {
        await expect(page.getByRole('row').filter({ hasText: label })).toHaveCount(0)
    });
 });
 test('SSH Key', async ({ context, page }, testInfo: TestInfo) => {
    const label = 'Test SSH key';
    await logUser(test, page, users.user1);
    const privateKey = await test.step('Create key entry', async () => {
        await page.getByRole('button', { name: 'New', exact: true }).click();
        await page.getByRole('menuitem', { name: 'SSH key' }).click();
        await page.getByRole('textbox', { name: 'Item name * (required)' }).fill('Test SSH key');
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'Item added');
        await page.getByRole('button', { name: 'Copy private key' }).click();
        await utils.checkNotification(page, 'Private key copied');
        return await page.evaluate(() => navigator.clipboard.readText());
    });
    // Log again
    await logUser(test, page, users.user1);
    await test.step('Check', async () => {
        await page.getByRole('row').filter({ hasText: label }).getByRole('button', { name: label }).click();
        await page.getByRole('button', { name: 'Copy private key' }).click();
        await utils.checkNotification(page, 'Private key copied');
        expect(await page.evaluate(() => navigator.clipboard.readText())).toBe(privateKey)
        await page.getByRole('button', { name: 'Close' }).click();
    });
    await test.step('Delete', async () => {
        await page.getByRole('row').filter({ hasText: label }).getByLabel('Options').click();
        await page.getByRole('menuitem', { name: 'Delete' }).click();
        await page.getByRole('button', { name: 'Yes' }).click();
        await utils.checkNotification(page, 'Item sent to bin');
    });
    // Log again
    await logUser(test, page, users.user1);
    await test.step('Deleted', async () => {
        await expect(page.getByRole('row').filter({ hasText: label })).toHaveCount(0)
    })
 });
@@ -21,11 +21,11 @@ test('Send', async ({ browser, page }) => {
        await page.getByRole('link', { name: 'Send' }).click();
        await expect(page.locator('#main-content').getByText('Send', { exact: true })).toBeVisible();
-        await page.getByRole('button', { name: 'New Send', exact: true }).click();
+        await page.getByRole('button', { name: 'New', exact: true }).click();
        await page.getByRole('menuitem', { name: 'Text' }).click();
-        await page.getByRole('textbox', { name: 'Send name * (required)' }).fill('Test');
+        await page.getByRole('textbox', { name: 'Send name (required)' }).fill('Test');
-        await page.getByRole('textbox', { name: 'Text to share * (required)' }).fill('test');
+        await page.getByRole('textbox', { name: 'Text to share (required)' }).fill('test');
        await page.getByRole('button', { name: 'Save' }).click();
        await page.locator('footer').getByRole('button', { name: 'Copy link' }).click();
@@ -46,14 +46,14 @@ test('Send', async ({ browser, page }) => {
        await page.getByRole('link', { name: 'Send' }).click();
        await expect(page.locator('#main-content').getByText('Send', { exact: true })).toBeVisible();
-        await page.getByRole('button', { name: 'New' }).click();
+        await page.getByRole('button', { name: 'New', exact: true }).click();
        await page.getByRole('menuitem', { name: 'Text' }).click();
-        await page.getByRole('textbox', { name: 'Send name * (required)' }).fill('Password');
+        await page.getByRole('textbox', { name: 'Send name (required)' }).fill('Password');
-        await page.getByRole('textbox', { name: 'Text to share * (required)' }).fill('password');
+        await page.getByRole('textbox', { name: 'Text to share (required)' }).fill('password');
        await page.getByRole('combobox', { name: 'Who can view' }).click();
        await page.getByText('Anyone with a password set by you').click();
-        await page.getByRole('textbox', { name: 'Password * (required)', exact: true }).fill('password');
+        await page.getByRole('textbox', { name: 'Password (required)' }).fill('password');
        await page.getByRole('button', { name: 'Save' }).click();
        await page.locator('footer').getByRole('button', { name: 'Copy link' }).click();
@@ -64,7 +64,7 @@ test('Send', async ({ browser, page }) => {
    await test.step('View with password', async () => {
        await page2.goto(pwd_url, { waitUntil: 'domcontentloaded' });
        await expect(page2.getByRole('heading', { name: 'Enter the password to view' })).toBeVisible();
-        await page2.getByRole('textbox', { name: 'Password * (required)' }).fill('password');
+        await page2.getByRole('textbox', { name: 'Password (required)' }).fill('password');
        await page2.getByRole('button', { name: 'Continue' }).click();
        await expect(page2.getByRole('heading', { name: 'View Send' })).toBeVisible();
        await expect(await page2.getByRole('paragraph').filter({ hasText: 'Password' })).toBeVisible();
@@ -4,24 +4,6 @@ import * as OTPAuth from "otpauth";
 import * as utils from '../../global-utils';
 export async function recoveryCodes(test: Test, page: Page, user: { name: string, password: string }): string {
    return await test.step('Recovery code', async () => {
        await page.getByRole('button', { name: user.name }).click();
        await page.getByRole('menuitem', { name: 'Account settings' }).click();
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Two-step login' }).click();
        await page.getByRole('button', { name: 'View recovery code' }).click();
        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
        await page.getByRole('button', { name: 'Continue' }).click();
        const recovery = await page.getByRole('code').innerText();
        await page.getByLabel('Close').click();
        return recovery;
    })
 }
 export async function activateTOTP(test: Test, page: Page, user: { name: string, password: string }): OTPAuth.TOTP {
    return await test.step('Activate TOTP 2FA', async () => {
        await page.getByRole('button', { name: user.name }).click();
@@ -29,16 +11,16 @@ export async function activateTOTP(test: Test, page: Page, user: { name: string,
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Two-step login' }).click();
        await page.locator('bit-item').filter({ hasText: /Authenticator app/ }).getByRole('button').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password (required)').fill(user.password);
        await page.getByRole('button', { name: 'Continue' }).click();
-        const secret = await page.getByLabel('Key', { exact: true }).innerText();
+        const secret = await page.getByLabel('Key').innerText();
        let totp = new OTPAuth.TOTP({ secret, period: 30 });
        await page.getByLabel(/Verification code/).fill(totp.generate());
        await page.getByRole('button', { name: 'Turn on' }).click();
        await page.getByRole('heading', { name: 'Turned on', exact: true });
        await page.getByLabel('Close').click();
        return totp;
    })
@@ -51,8 +33,8 @@ export async function disableTOTP(test: Test, page: Page, user: { password: stri
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Two-step login' }).click();
        await page.locator('bit-item').filter({ hasText: /Authenticator app/ }).getByRole('button').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).click()
+        await page.getByLabel('Master password (required)').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password (required)').fill(user.password);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByRole('button', { name: 'Turn off' }).click();
        await page.getByRole('button', { name: 'Yes' }).click();
@@ -67,7 +49,7 @@ export async function activateEmail(test: Test, page: Page, user: { name: string
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Two-step login' }).click();
        await page.locator('bit-item').filter({ hasText: 'Enter a code sent to your email' }).getByRole('button').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password (required)').fill(user.password);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByRole('button', { name: 'Send email' }).click();
    });
@@ -99,8 +81,8 @@ export async function disableEmail(test: Test, page: Page, user: { password: str
        await page.getByRole('link', { name: 'Security' }).click();
        await page.getByRole('link', { name: 'Two-step login' }).click();
        await page.locator('bit-item').filter({ hasText: 'Email' }).getByRole('button').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).click()
+        await page.getByLabel('Master password (required)').click();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password (required)').fill(user.password);
        await page.getByRole('button', { name: 'Continue' }).click();
        await page.getByRole('button', { name: 'Turn off' }).click();
        await page.getByRole('button', { name: 'Yes' }).click();
@@ -1,21 +0,0 @@
 import { expect, type Browser, Page } from '@playwright/test';
 import * as utils from '../../global-utils';
 utils.loadEnv();
 export async function login(test, page: Page) {
    await test.step(`Admin login`, async () => {
        await page.goto('/admin');
        await page.getByRole('textbox', { name: 'Enter admin token' }).fill(process.env.ADMIN_TOKEN);
        await page.getByRole('button', { name: 'Enter' }).click();
    });
 }
 export async function invite(test, page: Page, email: string) {
    await test.step(`Invite user with ${email}`, async () => {
        await page.getByRole('link', { name: 'Users' }).click();
        await page.getByRole('textbox', { name: 'Enter email' }).fill(email);
        await page.getByRole('button', { name: 'Invite' }).click();
        await expect(page.getByRole('row', { name: email })).toHaveText(/Invited/);
    });
 }
@@ -5,7 +5,7 @@ const utils = require('../../global-utils');
 utils.loadEnv();
 test('DB teardown ?', async ({ serviceName }) => {
-    if( process.env.PW_KEEP_SERVICE_RUNNING !== "true" ) {
+    if( process.env.PW_KEEP_SERVICE_RUNNNING !== "true" ) {
        utils.stopComposeService(serviceName);
    }
 });
@@ -3,14 +3,11 @@ import { expect, type Browser,Page } from '@playwright/test';
 import * as utils from '../../global-utils';
 export async function create(test, page: Page, name: string) {
-    await test.step(`Create Org ${name}`, async () => {
+    await test.step('Create Org', async () => {
-        let pm_locator = page.locator('a').filter({ hasText: 'Password Manager' });
+        await page.locator('a').filter({ hasText: 'Password Manager' }).first().click();
        if( await pm_locator.count() > 0 ){
            pm_locator.first().click();
        }
        await expect(page.getByTitle('All vaults', { exact: true })).toBeVisible();
        await page.getByRole('link', { name: 'New organisation' }).click();
-        await page.getByRole('textbox', { name: 'Organisation name * (required)', exact: true }).fill(name);
+        await page.getByLabel('Organisation name (required)').fill(name);
        await page.getByRole('button', { name: 'Submit' }).click();
        await utils.checkNotification(page, 'Organisation created');
@@ -21,7 +18,7 @@ export async function policies(test, page: Page, name: string) {
    await test.step(`Navigate to ${name} policies`, async () => {
        await page.locator('a').filter({ hasText: 'Admin Console' }).first().click();
        await page.locator('org-switcher').getByLabel(/Toggle collapse/).click();
-        await page.locator('org-switcher > bit-nav-group > div > bit-nav-item').filter({ hasText: `${name}` }).first().click();
+        await page.locator('org-switcher').getByRole('link', { name: `${name}` }).first().click();
        await expect(page.getByRole('heading', { name: `${name} collections` })).toBeVisible();
        await page.getByRole('button', { name: 'Toggle collapse Settings' }).click();
        await page.getByRole('link', { name: 'Policies' }).click();
@@ -33,11 +30,11 @@ export async function members(test, page: Page, name: string) {
    await test.step(`Navigate to ${name} members`, async () => {
        await page.locator('a').filter({ hasText: 'Admin Console' }).first().click();
        await page.locator('org-switcher').getByLabel(/Toggle collapse/).click();
-        await page.locator('org-switcher > bit-nav-group > div > bit-nav-item').filter({ hasText: `${name}` }).first().click();
+        await page.locator('org-switcher').getByRole('link', { name: `${name}` }).first().click();
        await expect(page.getByRole('heading', { name: `${name} collections` })).toBeVisible();
-        await page.getByRole('link', { name: 'Members' }).click();
+        await page.locator('div').filter({ hasText: 'Members' }).nth(2).click();
        await expect(page.getByRole('heading', { name: 'Members' })).toBeVisible();
-        await expect(page.getByRole('columnheader', { name: 'Select all' })).toBeVisible();
+        await expect(page.getByRole('cell', { name: 'All' })).toBeVisible();
    });
 }
@@ -45,13 +42,13 @@ export async function invite(test, page: Page, name: string, email: string) {
    await test.step(`Invite ${email}`, async () => {
        await expect(page.getByRole('heading', { name: 'Members' })).toBeVisible();
        await page.getByRole('button', { name: 'Invite member' }).click();
-        await page.getByRole('textbox', { name: 'Email * (required)', exact: true }).fill(email);
+        await page.getByLabel('Email (required)').fill(email);
        await page.getByRole('tab', { name: 'Collections' }).click();
        await page.getByRole('combobox', { name: 'Permission' }).click();
        await page.getByText('Edit items', { exact: true }).click();
-        await page.getByRole('combobox', { name: 'Select collections' }).click();
+        await page.getByLabel('Select collections').click();
-        await page.getByLabel('Options List').getByText('Default collection').click();
+        await page.getByText('Default collection').click();
-        await page.getByRole('columnheader', { name: 'Collection', exact: true }).click();
+        await page.getByRole('cell', { name: 'Collection', exact: true }).click();
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'User(s) invited');
    });
@@ -6,7 +6,7 @@ const utils = require('../../global-utils');
 utils.loadEnv();
 test('Keycloak teardown', async () => {
-    if( process.env.PW_KEEP_SERVICE_RUNNING === "true" ) {
+    if( process.env.PW_KEEP_SERVICE_RUNNNING === "true" ) {
        console.log("Keep Keycloak running");
    } else {
        console.log("Keycloak stopping");
@@ -15,8 +15,11 @@ export async function logNewUser(
    options: { mailBuffer?: MailBuffer } = {}
 ) {
    await test.step(`Create user ${user.name}`, async () => {
        await page.context().clearCookies();
        await test.step('Landing page', async () => {
            await utils.cleanLanding(page);
            await page.locator("input[type=email].vw-email-sso").fill(user.email);
            await page.getByRole('button', { name: /Use single sign-on/ }).click();
        });
@@ -30,24 +33,26 @@ export async function logNewUser(
        await test.step('Create Vault account', async () => {
            await expect(page.getByRole('heading', { name: 'Join organisation' })).toBeVisible();
-            await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+            await page.getByLabel('Master password (required)', { exact: true }).fill(user.password);
-            await page.getByRole('textbox', { name: 'Confirm master password * (' }).fill(user.password);
+            await page.getByLabel('Confirm master password (').fill(user.password);
            await page.getByRole('button', { name: 'Create account' }).click();
        });
        await utils.checkNotification(page, 'Account successfully created!');
        await utils.checkNotification(page, 'Invitation accepted');
        await utils.ignoreExtension(page);
        await test.step('Default vault page', async () => {
            await expect(page).toHaveTitle(/Vaultwarden Web/);
            await expect(page.getByTitle('All vaults', { exact: true })).toBeVisible();
        });
        await utils.checkNotification(page, 'Account successfully created!');
        await utils.checkNotification(page, 'Invitation accepted');
        if( options.mailBuffer ){
            let mailBuffer = options.mailBuffer;
            await test.step('Check emails', async () => {
                await mailBuffer.expect((m) => m.subject.includes("New Device Logged"));
                await mailBuffer.expect((m) => m.subject === "Welcome");
                await mailBuffer.expect((m) => m.subject.includes("New Device Logged"));
            });
        }
    });
@@ -64,14 +69,16 @@ export async function logUser(
        mailBuffer ?: MailBuffer,
        totp?: OTPAuth.TOTP,
        mail2fa?: boolean,
        notNewDevice?: boolean,
    } = {}
 ) {
    let mailBuffer = options.mailBuffer;
    await test.step(`Log user ${user.email}`, async () => {
        await page.context().clearCookies();
        await test.step('Landing page', async () => {
            await utils.cleanLanding(page);
            await page.locator("input[type=email].vw-email-sso").fill(user.email);
            await page.getByRole('button', { name: /Use single sign-on/ }).click();
        });
@@ -110,12 +117,14 @@ export async function logUser(
            await page.getByRole('button', { name: 'Unlock' }).click();
        });
        await utils.ignoreExtension(page);
        await test.step('Default vault page', async () => {
            await expect(page).toHaveTitle(/Vaultwarden Web/);
            await expect(page.getByTitle('All vaults', { exact: true })).toBeVisible();
        });
-        if( mailBuffer && !options.notNewDevice ){
+        if( mailBuffer ){
            await test.step('Check email', async () => {
                await mailBuffer.expect((m) => m.subject.includes("New Device Logged"));
            });
@@ -2,9 +2,7 @@ import { expect, type Browser, Page } from '@playwright/test';
 import { type MailBuffer } from 'maildev';
 import * as OTPAuth from "otpauth";
 import * as utils from '../../global-utils';
 import { retrieveEmailCode } from './2fa';
 export async function createAccount(test, page: Page, user: { email: string, name: string, password: string }, mailBuffer?: MailBuffer) {
    await test.step(`Create user ${user.name}`, async () => {
@@ -19,11 +17,12 @@ export async function createAccount(test, page: Page, user: { email: string, nam
        await page.getByRole('button', { name: 'Continue' }).click();
        // Vault finish Creation
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password (required)', { exact: true }).fill(user.password);
-        await page.getByRole('textbox', { name: 'Confirm master password * (' }).fill(user.password);
+        await page.getByLabel('Confirm master password (').fill(user.password);
        await page.getByRole('button', { name: 'Create account' }).click();
        await utils.checkNotification(page, 'Your new account has been created')
        await utils.ignoreExtension(page);
        // We are now in the default vault page
        await expect(page).toHaveTitle('Vaults | Vaultwarden Web');
@@ -36,17 +35,7 @@ export async function createAccount(test, page: Page, user: { email: string, nam
    });
 }
-export async function logUser(
+export async function logUser(test, page: Page, user: { email: string, password: string }, mailBuffer?: MailBuffer) {
    test,
    page: Page,
    user: { email: string, password: string },
    options: {
        mailBuffer ?: MailBuffer,
        mail2fa?: boolean,
        notNewDevice?: boolean,
        totp?: OTPAuth.TOTP,
    } = {}
 ) {
    await test.step(`Log user ${user.email}`, async () => {
        await utils.cleanLanding(page);
@@ -54,35 +43,16 @@ export async function logUser(
        await page.getByRole('button', { name: 'Continue' }).click();
        // Unlock page
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(user.password);
+        await page.getByLabel('Master password').fill(user.password);
-        await page.getByRole('button', { name: 'Log in', exact: true }).click();
+        await page.getByRole('button', { name: 'Log in with master password' }).click();
-        if( options.mail2fa || options.totp ){
+        await utils.ignoreExtension(page);
            let code;
            await test.step('2FA check', async () => {
                await expect(page.getByRole('heading', { name: 'Verify your Identity' })).toBeVisible();
                if( options.totp ) {
                    const totp = options.totp;
                    let timestamp = Date.now(); // Needed to use the next token
                    timestamp = timestamp + (totp.period - (Math.floor(timestamp / 1000) % totp.period) + 1) * 1000;
                    code = totp.generate({timestamp});
                } else if( options.mail2fa ){
                    code = await retrieveEmailCode(test, page, options.mailBuffer);
                }
                await page.getByLabel(/Verification code/).fill(code);
                await page.getByRole('button', { name: 'Continue' }).click();
            });
        }
        // We are now in the default vault page
        await expect(page).toHaveTitle(/Vaultwarden Web/);
-        if( options.mailBuffer && !options.notNewDevice ){
+        if( mailBuffer ){
-            await options.mailBuffer.expect((m) => m.subject === "New Device Logged In From Firefox");
+            await mailBuffer.expect((m) => m.subject === "New Device Logged In From Firefox");
        }
    });
 }
@@ -1,7 +1,6 @@
 import { test, expect, type TestInfo } from '@playwright/test';
 import { MailDev } from 'maildev';
 import * as admin from "./setups/admin";
 import { logNewUser, logUser } from './setups/sso';
 import { activateEmail, disableEmail } from './setups/2fa';
 import * as utils from "../global-utils";
@@ -20,7 +19,7 @@ test.beforeAll('Setup', async ({ browser }, testInfo: TestInfo) => {
    await utils.startVault(browser, testInfo, {
        SSO_ENABLED: true,
-        SSO_ONLY: true,
+        SSO_ONLY: false,
        SMTP_HOST: process.env.MAILDEV_HOST,
        SMTP_FROM: process.env.PW_SMTP_FROM,
    });
@@ -33,64 +32,22 @@ test.afterAll('Teardown', async ({}) => {
    }
 });
-test('2FA email', async ({ page }) => {
+test('Create and activate 2FA', async ({ page }) => {
    const mailBuffer = mailserver.buffer(users.user1.email);
    await logNewUser(test, page, users.user1, {mailBuffer: mailBuffer});
    await activateEmail(test, page, users.user1, mailBuffer);
-    await logUser(test, page, users.user1, {mailBuffer: mailBuffer, mail2fa: true, notNewDevice: true});
+    mailBuffer.close();
 });
 test('Log and disable', async ({ page }) => {
    const mailBuffer = mailserver.buffer(users.user1.email);
    await logUser(test, page, users.user1, {mailBuffer: mailBuffer, mail2fa: true});
    await disableEmail(test, page, users.user1);
    mailBuffer.close();
 });
 test('Admin invite', async ({ page }) => {
    const mailBuffer = mailserver.buffer(users.user2.email);
    await admin.login(test, page);
    await admin.invite(test, page, users.user2.email);
    const link = await test.step('Extract email link', async () => {
        const invited = await mailBuffer.expect((m) => m.subject === "Join Vaultwarden");
        await page.setContent(invited.html);
        return await page.getByTestId("invite").getAttribute("href");
    });
    await test.step('Redirect to Keycloak', async () => {
        await page.goto(link);
    });
    await test.step('Keycloak login', async () => {
        await expect(page.getByRole('heading', { name: 'Sign in to your account' })).toBeVisible();
        await page.getByLabel(/Username/).fill(users.user2.name);
        await page.getByLabel('Password', { exact: true }).fill(users.user2.password);
        await page.getByRole('button', { name: 'Sign In' }).click();
    });
    await test.step('Create Vault account', async () => {
        await expect(page.getByRole('heading', { name: 'Join organisation' })).toBeVisible();
        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user2.password);
        await page.getByRole('textbox', { name: 'Confirm master password * (' }).fill(users.user2.password);
        await page.getByRole('button', { name: 'Create account' }).click();
    });
    await test.step('Default vault page', async () => {
        await expect(page).toHaveTitle('Vaults | Vaultwarden Web');
        await utils.checkNotification(page, 'Account successfully created!');
        await utils.checkNotification(page, 'Invitation accepted');
    });
    await test.step('Check mails', async () => {
        await mailBuffer.expect((m) => m.subject.includes("New Device Logged"));
        await mailBuffer.expect((m) => m.subject === "Welcome");
    });
    mailBuffer.close();
 });
@@ -33,8 +33,8 @@ test('Non SSO login', async ({ page }) => {
    await page.getByRole('button', { name: 'Other' }).click();
    // Unlock page
-    await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user1.password);
+    await page.getByLabel('Master password').fill(users.user1.password);
-    await page.getByRole('button', { name: 'Log in', exact: true }).click();
+    await page.getByRole('button', { name: 'Log in with master password' }).click();
    // We are now in the default vault page
    await expect(page).toHaveTitle(/Vaultwarden Web/);
@@ -58,7 +58,6 @@ test('Non SSO login impossible', async ({ page, browser }, testInfo: TestInfo) =
    // Landing page
    await page.goto('/');
    await page.locator("input[type=email].vw-email-sso").fill(users.user1.email);
    // Check that SSO login is available
    await expect(page.getByRole('button', { name: /Use single sign-on/ })).toHaveCount(1);
@@ -67,6 +66,7 @@ test('Non SSO login impossible', async ({ page, browser }, testInfo: TestInfo) =
    await expect(page.getByRole('button', { name: 'Other' })).toHaveCount(0);
 });
 test('No SSO login', async ({ page }, testInfo: TestInfo) => {
    await utils.restartVault(page, testInfo, {
        SSO_ENABLED: false
@@ -74,14 +74,12 @@ test('No SSO login', async ({ page }, testInfo: TestInfo) => {
    // Landing page
    await page.goto('/');
    await page.getByLabel(/Email address/).fill(users.user1.email);
    // No SSO button (rely on a correct selector checked in previous test)
    await page.getByLabel('Master password');
    await expect(page.getByRole('button', { name: /Use single sign-on/ })).toHaveCount(0);
    // Can continue to Master password
    await page.getByLabel(/Email address/).fill(users.user1.email);
    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('button', { name: 'Log in' })).toHaveCount(1);
+    await expect(page.getByRole('button', { name: 'Log in with master password' })).toHaveCount(1);
 });
@@ -67,16 +67,17 @@ test('invited with new account', async ({ page }) => {
    await test.step('Create Vault account', async () => {
        await expect(page.getByRole('heading', { name: 'Join organisation' })).toBeVisible();
-        await page.getByRole('textbox', { name: 'Master password * (required)', exact: true }).fill(users.user2.password);
+        await page.getByLabel('Master password (required)', { exact: true }).fill(users.user2.password);
-        await page.getByRole('textbox', { name: 'Confirm master password * (' }).fill(users.user2.password);
+        await page.getByLabel('Confirm master password (').fill(users.user2.password);
        await page.getByRole('button', { name: 'Create account' }).click();
        await utils.checkNotification(page, 'Account successfully created!');
        await utils.checkNotification(page, 'Invitation accepted');
        await utils.ignoreExtension(page);
    });
    await test.step('Default vault page', async () => {
        await expect(page).toHaveTitle(/Vaultwarden Web/);
        await utils.checkNotification(page, 'Account successfully created!');
        await utils.checkNotification(page, 'Invitation accepted');
    });
    await test.step('Check mails', async () => {
@@ -94,7 +95,6 @@ test('invited with existing account', async ({ page }) => {
    await test.step('Redirect to Keycloak', async () => {
        await page.goto(link);
        await page.getByRole('button', { name: /Use single sign-on/ }).click();
    });
    await test.step('Keycloak login', async () => {
@@ -108,11 +108,13 @@ test('invited with existing account', async ({ page }) => {
        await expect(page).toHaveTitle('Vaultwarden Web');
        await page.getByLabel('Master password').fill(users.user3.password);
        await page.getByRole('button', { name: 'Unlock' }).click();
        await utils.checkNotification(page, 'Invitation accepted');
        await utils.ignoreExtension(page);
    });
    await test.step('Default vault page', async () => {
        await expect(page).toHaveTitle(/Vaultwarden Web/);
        await utils.checkNotification(page, 'Successfully accepted your invitation');
    });
    await test.step('Check mails', async () => {
@@ -49,7 +49,7 @@ test('Organization is visible', async ({ page }) => {
    await expect(page.getByLabel('Filter: Default collection')).toBeVisible();
 });
-test('Activate password policy', async ({ page }) => {
+test('Enforce password policy', async ({ page }) => {
    await logUser(test, page, users.user1);
    await orgs.policies(test, page, '/Test');
@@ -61,27 +61,16 @@ test('Activate password policy', async ({ page }) => {
        await page.getByRole('button', { name: 'Save' }).click();
        await utils.checkNotification(page, 'Edited policy Master password requirements.');
    });
 });
-test('Unlock trigger policyy', async ({ page }) => {
+    await utils.logout(test, page, users.user1);
    await page.goto('/', { waitUntil: 'domcontentloaded' });
-    await page.locator("input[type=email].vw-email-sso").fill(users.user2.email);
+    await test.step(`Unlock trigger policy`, async () => {
-    await page.getByRole('button', { name: /Use single sign-on/ }).click();
+        await page.locator("input[type=email].vw-email-sso").fill(users.user1.email);
        await page.getByRole('button', { name: 'Use single sign-on' }).click();
-    await test.step('Keycloak login', async () => {
+        await page.getByRole('textbox', { name: 'Master password (required)' }).fill(users.user1.password);
        await expect(page.getByRole('heading', { name: 'Sign in to your account' })).toBeVisible();
        await page.getByLabel(/Username/).fill(users.user2.name);
        await page.getByLabel('Password', { exact: true }).fill(users.user2.password);
        await page.getByRole('button', { name: 'Sign In' }).click();
    });
    await test.step('Unlock vault', async () => {
        await expect(page).toHaveTitle('Vaultwarden Web');
        await expect(page.getByRole('heading', { name: 'Your vault is locked' })).toBeVisible();
        await page.getByLabel('Master password').fill(users.user2.password);
        await page.getByRole('button', { name: 'Unlock' }).click();
    });
-    await expect(page.getByRole('heading', { name: 'Update master password' })).toBeVisible();
+        await expect(page.getByRole('heading', { name: 'Update master password' })).toBeVisible();
    });
 });
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.99.0"
+channel = "1.96.1"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"
@@ -231,7 +231,7 @@ fn validate_token(token: &str) -> bool {
        None => false,
        Some(t) if t.starts_with("$argon2") => {
            use argon2::password_hash::PasswordVerifier;
-            match argon2::password_hash::phc::PasswordHash::new(t) {
+            match argon2::password_hash::PasswordHash::new(t) {
                Ok(h) => {
                    // NOTE: hash params from `ADMIN_TOKEN` are used instead of what is configured in the `Argon2` instance.
                    argon2::Argon2::default().verify_password(token.trim().as_ref(), &h).is_ok()
@@ -425,7 +425,7 @@ async fn delete_user(user_id: UserId, token: AdminToken, conn: DbConn) -> EmptyR
    for membership in memberships {
        log_event(
-            EventType::OrganizationUserDeleted,
+            EventType::OrganizationUserDeleted as i32,
            &membership.uuid,
            &membership.org_uuid,
            &ACTING_ADMIN_USER.into(),
@@ -446,7 +446,7 @@ async fn delete_sso_user(user_id: UserId, token: AdminToken, conn: DbConn) -> Em
    for membership in memberships {
        log_event(
-            EventType::OrganizationUserUnlinkedSso,
+            EventType::OrganizationUserUnlinkedSso as i32,
            &membership.uuid,
            &membership.org_uuid,
            &ACTING_ADMIN_USER.into(),
@@ -508,7 +508,6 @@ async fn enable_user(user_id: UserId, _token: AdminToken, conn: DbConn) -> Empty
 async fn remove_2fa(user_id: UserId, token: AdminToken, conn: DbConn) -> EmptyResult {
    let mut user = get_user_or_404(&user_id, &conn).await?;
    TwoFactor::delete_all_by_user(&user.uuid, &conn).await?;
    Device::clear_twofactor_remember_by_user(&user.uuid, &conn).await?;
    two_factor::enforce_2fa_policy(&user, &ACTING_ADMIN_USER.into(), 14, &token.ip.ip, &conn).await?;
    user.totp_recover = None;
    user.save(&conn).await
@@ -572,7 +571,7 @@ async fn update_membership_type(data: Json<MembershipTypeData>, token: AdminToke
    OrgPolicy::check_user_allowed(&member_to_edit, "modify", &conn).await?;
    log_event(
-        EventType::OrganizationUserUpdated,
+        EventType::OrganizationUserUpdated as i32,
        &member_to_edit.uuid,
        &data.org_uuid,
        &ACTING_ADMIN_USER.into(),
@@ -648,7 +647,7 @@ use cached::macros::cached;
 /// Cache this function to prevent API call rate limit. Github only allows 60 requests per hour, and we use 3 here already
 /// It will cache this function for 600 seconds (10 minutes) which should prevent the exhaustion of the rate limit
 /// Any cache will be lost if Vaultwarden is restarted
-#[cached(ttl_secs = 600, sync_writes = "default")]
+#[cached(ttl = 600, sync_writes = "default")]
 async fn get_release_info(has_http_access: bool) -> (String, String, String) {
    // If the HTTP Check failed, do not even attempt to check for new versions since we were not able to connect with github.com anyway.
    if has_http_access {
@@ -717,36 +716,6 @@ fn web_vault_compare(active: &str, latest: &str) -> i8 {
    }
 }
 fn check_template_overrides() -> Vec<&'static str> {
    let template_folder = std::path::PathBuf::from(CONFIG.templates_folder());
    let mut overrides = Vec::new();
    for folder in ["admin", "email", "scss"] {
        if folder_has_hbs_files(&template_folder.join(folder)) {
            overrides.push(folder);
        }
    }
    if folder_has_hbs_files(&template_folder) {
        overrides.push("other");
    }
    overrides
 }
 fn folder_has_hbs_files(dir: &std::path::Path) -> bool {
    let Ok(files) = std::fs::read_dir(dir) else {
        // No files in this directory at all, so we can return false
        return false;
    };
    files.flatten().any(|f| {
        // Validate if it is a file and if it has the `.hbs` extension and starts with a-z or 0-9
        f.file_type().is_ok_and(|t| t.is_file())
            && f.path().extension().is_some_and(|e| e.eq_ignore_ascii_case("hbs"))
            && f.file_name().to_str().is_some_and(|n| n.starts_with(|c: char| c.is_ascii_alphanumeric()))
    })
 }
 #[get("/diagnostics")]
 async fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> ApiResult<Html<String>> {
    use chrono::prelude::*;
@@ -801,7 +770,6 @@ async fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> A
        "db_version": get_sql_server_version(&conn).await,
        "admin_url": format!("{}/diagnostics", admin_url()),
        "overrides": &CONFIG.get_overrides().join(", "),
        "template_overrides": check_template_overrides().join(", "),
        "invalid_feature_flags": invalid_feature_flags,
        "host_arch": env::consts::ARCH,
        "host_os":  env::consts::OS,
@@ -906,23 +874,23 @@ mod tests {
    fn validate_web_vault_compare() {
        // web_vault_compare(active, latest)
        // Test normal versions
-        assert_eq!(web_vault_compare("2025.12.0", "2025.12.1"), -1);
+        assert!(web_vault_compare("2025.12.0", "2025.12.1") == -1);
-        assert_eq!(web_vault_compare("2025.12.1", "2025.12.1"), 0);
+        assert!(web_vault_compare("2025.12.1", "2025.12.1") == 0);
-        assert_eq!(web_vault_compare("2025.12.2", "2025.12.1"), 1);
+        assert!(web_vault_compare("2025.12.2", "2025.12.1") == 1);
        // Test patched/+build.n versions
        // Newer latest version
-        assert_eq!(web_vault_compare("2025.12.0+build.1", "2025.12.1"), -1);
+        assert!(web_vault_compare("2025.12.0+build.1", "2025.12.1") == -1);
-        assert_eq!(web_vault_compare("2025.12.1", "2025.12.1+build.1"), -1);
+        assert!(web_vault_compare("2025.12.1", "2025.12.1+build.1") == -1);
-        assert_eq!(web_vault_compare("2025.12.0+build.1", "2025.12.1+build.1"), -1);
+        assert!(web_vault_compare("2025.12.0+build.1", "2025.12.1+build.1") == -1);
-        assert_eq!(web_vault_compare("2025.12.1+build.1", "2025.12.1+build.2"), -1);
+        assert!(web_vault_compare("2025.12.1+build.1", "2025.12.1+build.2") == -1);
        // Equal versions
-        assert_eq!(web_vault_compare("2025.12.1+build.1", "2025.12.1+build.1"), 0);
+        assert!(web_vault_compare("2025.12.1+build.1", "2025.12.1+build.1") == 0);
-        assert_eq!(web_vault_compare("2025.12.2+build.2", "2025.12.2+build.2"), 0);
+        assert!(web_vault_compare("2025.12.2+build.2", "2025.12.2+build.2") == 0);
        // Newer active version
-        assert_eq!(web_vault_compare("2025.12.1+build.1", "2025.12.1"), 1);
+        assert!(web_vault_compare("2025.12.1+build.1", "2025.12.1") == 1);
-        assert_eq!(web_vault_compare("2025.12.2", "2025.12.1+build.1"), 1);
+        assert!(web_vault_compare("2025.12.2", "2025.12.1+build.1") == 1);
-        assert_eq!(web_vault_compare("2025.12.2+build.1", "2025.12.1+build.1"), 1);
+        assert!(web_vault_compare("2025.12.2+build.1", "2025.12.1+build.1") == 1);
-        assert_eq!(web_vault_compare("2025.12.1+build.3", "2025.12.1+build.2"), 1);
+        assert!(web_vault_compare("2025.12.1+build.3", "2025.12.1+build.2") == 1);
    }
 }
@@ -6,7 +6,6 @@ use rocket::{
    Route,
    form::{Form, FromForm},
    fs::TempFile,
    http::Status,
    serde::json::Json,
 };
 use serde_json::Value;
@@ -22,15 +21,14 @@ use crate::{
        DbConn, DbPool,
        models::{
            Archive, Attachment, AttachmentId, Cipher, CipherId, Collection, CollectionCipher, CollectionGroup,
-            CollectionId, CollectionUser, EventType, Favorite, Folder, FolderCipher, FolderId, Group, KeyId,
+            CollectionId, CollectionUser, EventType, Favorite, Folder, FolderCipher, FolderId, Group, Membership,
-            Membership, MembershipType, OrgPolicy, OrgPolicyType, OrganizationId, RepromptType, Send, User, UserId,
+            MembershipType, OrgPolicy, OrgPolicyType, OrganizationId, RepromptType, Send, UserId,
            is_data_blob_encrypted,
        },
    },
    util::{NumberOrString, deser_opt_nonempty_str, save_temp_file},
 };
-use super::{folders::FolderData, sends::SIZE_525_MB};
+use super::folders::FolderData;
 pub fn routes() -> Vec<Route> {
    // Note that many routes have an `admin` variant; this seems to be
@@ -163,19 +161,13 @@ async fn sync(data: SyncData, headers: Headers, client_version: Option<ClientVer
    let policies_json: Vec<Value> =
        OrgPolicy::find_confirmed_by_user(&headers.user.uuid, &conn).await.iter().map(OrgPolicy::to_json).collect();
    let policies_new_json: Vec<Value> = OrgPolicy::find_accepted_and_confirmed_by_user(&headers.user.uuid, &conn)
        .await
        .iter()
        .map(OrgPolicy::to_json)
        .collect();
    let domains_json = if data.exclude_domains {
        Value::Null
    } else {
        api::core::get_eq_domains(&headers, true).into_inner()
    };
-    // This is very similar to the userDecryptionOptions sent in connect/token,
+    // This is very similar to the the userDecryptionOptions sent in connect/token,
    // but as of 2025-12-19 they're both using different casing conventions.
    let has_master_password = !headers.user.password_hash.is_empty();
    let master_password_unlock = if has_master_password {
@@ -190,29 +182,23 @@ async fn sync(data: SyncData, headers: Headers, client_version: Option<ClientVer
            // https://github.com/bitwarden/android/blob/release/2025.12-rc41/network/src/main/kotlin/com/bitwarden/network/model/MasterPasswordUnlockDataJson.kt#L22-L26
            "masterKeyEncryptedUserKey": headers.user.akey,
            "masterKeyWrappedUserKey": headers.user.akey,
-            "salt": headers.user.email,
+            "salt": headers.user.email
            "containedKeyId": headers.user.key_id,
        })
    } else {
        Value::Null
    };
    // Upstream omits these when unset rather than sending null
    let mut user_decryption = json!({ "masterPasswordUnlock": master_password_unlock });
    if let Some(key_id) = &headers.user.key_id {
        user_decryption["userKeyId"] = json!(key_id);
    }
    Ok(Json(json!({
        "profile": user_json,
        "folders": folders_json,
        "collections": collections_json,
        "policies": policies_json,
        "policiesNew": policies_new_json,
        "ciphers": ciphers_json,
        "domains": domains_json,
        "sends": sends_json,
-        "userDecryption": user_decryption,
+        "userDecryption": {
            "masterPasswordUnlock": master_password_unlock,
        },
        "object": "sync"
    })))
 }
@@ -274,24 +260,15 @@ pub struct CipherData {
    key: Option<String>,
    // Added in web-v2025.6.0. Deprecated upstream for `encrypted_by_key_id`, but still checked when sent
    pub encrypted_for: Option<UserId>,
    // Added in web-v2025.8.1, Optional for compat
    pub encrypted_by_key_id: Option<KeyId>,
    /*
    Login = 1,
    SecureNote = 2,
    Card = 3,
    Identity = 4,
    SshKey = 5
    BankAccount = 6
    DriversLicense = 7
    Passport = 8
    */
    pub r#type: i32,
-    // Absent on a blob-encrypted cipher, whose name is sealed inside `data`
+    pub name: String,
    pub name: Option<String>,
    pub notes: Option<String>,
    fields: Option<Value>,
@@ -301,12 +278,6 @@ pub struct CipherData {
    card: Option<Value>,
    identity: Option<Value>,
    ssh_key: Option<Value>,
    bank_account: Option<Value>,
    drivers_license: Option<Value>,
    passport: Option<Value>,
    // The sealed blob of a v2 account's cipher, which replaces all of the fields above
    data: Option<String>,
    favorite: Option<bool>,
    reprompt: Option<i32>,
@@ -329,79 +300,6 @@ pub struct CipherData {
    archived_date: Option<String>,
 }
 /// A field of a [`CipherData`] that fails upstream's model validation.
 #[derive(Debug)]
 pub struct CipherValidationError {
    pub field: &'static str,
    pub message: String,
 }
 impl From<CipherValidationError> for crate::Error {
    fn from(e: CipherValidationError) -> Self {
        Self::new_msg(e.message)
    }
 }
 /// The cipher must have been encrypted for the acting user. Only checked when the client sends the field.
 ///
 /// Ref: <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Controllers/CiphersController.cs#L1857-L1870>
 fn validate_encrypted_for_user(data: &CipherData, user_id: &UserId) -> EmptyResult {
    if data.encrypted_for.as_ref().is_some_and(|encrypted_for| encrypted_for != user_id) {
        err!("Cipher was not encrypted for the current user. Please try again.")
    }
    Ok(())
 }
 /// [`validate_encrypted_for_user`], plus the key id of a user-owned cipher, when both ids are known.
 ///
 /// Ref: <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Controllers/CiphersController.cs#L1886-L1911>
 fn validate_encrypted_by_user(data: &CipherData, user: &User, is_org_cipher: bool) -> EmptyResult {
    validate_encrypted_for_user(data, &user.uuid)?;
    if !is_org_cipher
        && let (Some(cipher_key_id), Some(user_key_id)) = (&data.encrypted_by_key_id, &user.key_id)
        && cipher_key_id != user_key_id
    {
        err!("Cipher was not encrypted with the current user key. Please try again.")
    }
    Ok(())
 }
 /// Upstream's `[StringLength(500000)]` on `CipherRequestModel.Data`
 const MAX_CIPHER_DATA_LENGTH: usize = 500_000;
 impl CipherData {
    /// Whether `data` is a blob rather than the per-type fields. Parses `data`, so keep the result.
    pub fn is_blob(&self) -> bool {
        self.data.as_deref().is_some_and(is_data_blob_encrypted)
    }
    /// Upstream's model checks that depend on the format: the size of `data`, and a name unless it's a blob.
    ///
    /// Ref: <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Models/Request/CipherRequestModel.cs#L76-L77>
    /// and <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Models/Request/CipherRequestModel.cs#L91-L99>
    pub fn validate_content(&self, is_blob: bool) -> Result<(), CipherValidationError> {
        if let Some(data) = &self.data
            && data.len() > MAX_CIPHER_DATA_LENGTH
        {
            return Err(CipherValidationError {
                field: "Data",
                message: format!("The field Data must be a string with a maximum length of {MAX_CIPHER_DATA_LENGTH}."),
            });
        }
        // A blob carries the name inside it, so only the other formats need one
        if !is_blob && self.name.as_deref().is_none_or(|n| n.trim().is_empty()) {
            return Err(CipherValidationError {
                field: "Name",
                message: String::from("The Name field is required."),
            });
        }
        Ok(())
    }
 }
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PartialCipherData {
@@ -435,14 +333,12 @@ async fn post_ciphers_create(
 ) -> JsonResult {
    let mut data: ShareCipherData = data.into_inner();
    validate_encrypted_by_user(&data.cipher, &headers.user, data.cipher.organization_id.is_some())?;
    // This check is usually only needed in update_cipher_from_data(), but we
    // need it here as well to avoid creating an empty cipher in the call to
    // cipher.save() below.
    enforce_personal_ownership_policy(Some(&data.cipher), &headers, &conn).await?;
-    let mut cipher = Cipher::new(data.cipher.r#type);
+    let mut cipher = Cipher::new(data.cipher.r#type, data.cipher.name.clone());
    cipher.user_uuid = Some(headers.user.uuid.clone());
    cipher.save(&conn).await?;
@@ -466,15 +362,13 @@ async fn post_ciphers_create(
 async fn post_ciphers(data: Json<CipherData>, headers: Headers, conn: DbConn, nt: Notify<'_>) -> JsonResult {
    let mut data: CipherData = data.into_inner();
    validate_encrypted_by_user(&data, &headers.user, data.organization_id.is_some())?;
    // The web/browser clients set this field to null as expected, but the
    // mobile clients seem to set the invalid value `0001-01-01T00:00:00`,
    // which results in a warning message being logged. This field isn't
    // needed when creating a new cipher, so just ignore it unconditionally.
    data.last_known_revision_date = None;
-    let mut cipher = Cipher::new(data.r#type);
+    let mut cipher = Cipher::new(data.r#type, data.name.clone());
    update_cipher_from_data(&mut cipher, data, &headers, None, &conn, &nt, UpdateType::SyncCipherCreate).await?;
    Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, CipherSyncType::User, &conn).await?))
@@ -498,44 +392,6 @@ async fn enforce_personal_ownership_policy(data: Option<&CipherData>, headers: &
    Ok(())
 }
 /// The checks of saving a cipher, for callers that run them before writing anything else
 async fn validate_cipher_update(
    cipher: &Cipher,
    data: &CipherData,
    headers: &Headers,
    conn: &DbConn,
    ut: UpdateType,
 ) -> EmptyResult {
    // Check that the client isn't updating an existing cipher with stale data.
    // And only perform this check when not importing ciphers, else the date/time check will fail.
    if ut != UpdateType::None
        && let Some(dt) = &data.last_known_revision_date
    {
        match NaiveDateTime::parse_from_str(dt, "%+") {
            // ISO 8601 format
            Err(err) => warn!("Error parsing LastKnownRevisionDate '{dt}': {err}"),
            Ok(dt) if cipher.updated_at.signed_duration_since(dt).num_seconds() > 1 => {
                err!("The client copy of this cipher is out of date. Resync the client and try again.")
            }
            Ok(_) => (),
        }
    }
    if let Some(note) = &data.notes {
        let max_note_size = CONFIG._max_note_size();
        if note.len() > max_note_size {
            err!(format!("The field Notes exceeds the maximum encrypted value length of {max_note_size} characters."))
        }
    }
    if let Some(folder_id) = &data.folder_id
        && Folder::find_by_uuid_and_user(folder_id, &headers.user.uuid, conn).await.is_none()
    {
        err!("Invalid folder", "Folder does not exist or belongs to another user");
    }
    Ok(())
 }
 pub async fn update_cipher_from_data(
    cipher: &mut Cipher,
    data: CipherData,
@@ -551,24 +407,42 @@ pub async fn update_cipher_from_data(
    // We do not mind which data is in it, the keep our model more flexible when there are upstream changes.
    // But, we at least know we do not need to store and return this specific key.
    fn clean_cipher_data(mut json_data: Value) -> Value {
-        if let Some(items) = json_data.as_array_mut() {
+        if json_data.is_array() {
-            for item in items.iter_mut().filter_map(Value::as_object_mut) {
+            json_data.as_array_mut().unwrap().iter_mut().for_each(|ref mut f| {
-                item.remove("response");
+                f.as_object_mut().unwrap().remove("response");
-            }
+            });
        }
        json_data
    }
    enforce_personal_ownership_policy(Some(&data), headers, conn).await?;
-    let is_blob = data.is_blob();
+    // Check that the client isn't updating an existing cipher with stale data.
-    data.validate_content(is_blob)?;
+    // And only perform this check when not importing ciphers, else the date/time check will fail.
-    validate_cipher_update(cipher, &data, headers, conn, ut).await?;
+    if ut != UpdateType::None
        && let Some(dt) = data.last_known_revision_date
    {
        match NaiveDateTime::parse_from_str(&dt, "%+") {
            // ISO 8601 format
            Err(err) => warn!("Error parsing LastKnownRevisionDate '{dt}': {err}"),
            Ok(dt) if cipher.updated_at.signed_duration_since(dt).num_seconds() > 1 => {
                err!("The client copy of this cipher is out of date. Resync the client and try again.")
            }
            Ok(_) => (),
        }
    }
    if cipher.organization_uuid.is_some() && cipher.organization_uuid != data.organization_id {
        err!("Organization mismatch. Please resync the client before updating the cipher")
    }
    if let Some(note) = &data.notes {
        let max_note_size = CONFIG._max_note_size();
        if note.len() > max_note_size {
            err!(format!("The field Notes exceeds the maximum encrypted value length of {max_note_size} characters."))
        }
    }
    // Check if this cipher is being transferred from a personal to an organization vault
    let transfer_cipher = cipher.organization_uuid.is_none() && data.organization_id.is_some();
@@ -578,10 +452,9 @@ pub async fn update_cipher_from_data(
            Some(member) => {
                // A non-empty list of collections implies the caller already validated the user's write
                // access to them, so we can move the cipher into the organization on that basis.
                // Write access to the cipher itself only counts when it already belongs to this organization.
                if shared_to_collections.as_ref().is_some_and(|cols| !cols.is_empty())
                    || member.has_full_access()
-                    || (!transfer_cipher && cipher.is_write_accessible_to_user(&headers.user.uuid, conn).await)
+                    || cipher.is_write_accessible_to_user(&headers.user.uuid, conn).await
                {
                    cipher.organization_uuid = Some(org_id);
                    // After some discussion in PR #1329 re-added the user_uuid = None again.
@@ -599,6 +472,12 @@ pub async fn update_cipher_from_data(
        cipher.user_uuid = Some(headers.user.uuid.clone());
    }
    if let Some(ref folder_id) = data.folder_id
        && Folder::find_by_uuid_and_user(folder_id, &headers.user.uuid, conn).await.is_none()
    {
        err!("Invalid folder", "Folder does not exist or belongs to another user");
    }
    // Modify attachments name and keys when rotating
    if let Some(attachments) = data.attachments2 {
        for (id, attachment) in attachments {
@@ -631,54 +510,38 @@ pub async fn update_cipher_from_data(
        3 => data.card,
        4 => data.identity,
        5 => data.ssh_key,
        6 => data.bank_account,
        7 => data.drivers_license,
        8 => data.passport,
        _ => err!("Invalid type"),
    };
-    if let Some(blob) = data.data.filter(|_| is_blob) {
+    let type_data = if let Some(mut data) = type_data_opt {
        // A blob holds everything, the name included; the column can't be null, so it's left empty
        // TODO: Make `ciphers.name` nullable and store `None` here instead.
        cipher.name = String::new();
        cipher.notes = None;
        cipher.fields = None;
        cipher.password_history = None;
        cipher.data = blob;
    } else {
        let Some(mut type_data) = type_data_opt else {
            err!("Data missing")
        };
        // Remove the 'Response' key from the base object.
-        if let Some(data_obj) = type_data.as_object_mut() {
+        data.as_object_mut().unwrap().remove("response");
            data_obj.remove("response");
        }
        // Remove the 'Response' key from every Uri.
-        if type_data["uris"].is_array() {
+        if data["uris"].is_array() {
-            type_data["uris"] = clean_cipher_data(type_data["uris"].clone());
+            data["uris"] = clean_cipher_data(data["uris"].clone());
        }
-
+        data
-        // `validate_content` made sure there is a name
+    } else {
-        cipher.name = data.name.unwrap_or_default();
+        err!("Data missing")
-        cipher.notes = data.notes;
+    };
        cipher.fields = data.fields.map(|f| clean_cipher_data(f).to_string());
        cipher.password_history = data.password_history.map(|f| f.to_string());
        cipher.data = type_data.to_string();
    }
    cipher.key = data.key;
    cipher.name = data.name;
    cipher.notes = data.notes;
    cipher.fields = data.fields.map(|f| clean_cipher_data(f).to_string());
    cipher.data = type_data.to_string();
    cipher.password_history = data.password_history.map(|f| f.to_string());
    cipher.reprompt = data.reprompt.filter(|r| *r == RepromptType::None as i32 || *r == RepromptType::Password as i32);
    cipher.save(conn).await?;
    cipher.move_to_folder(data.folder_id, &headers.user.uuid, conn).await?;
    cipher.set_favorite(data.favorite, &headers.user.uuid, conn).await?;
-    match data.archived_date {
+    if let Some(dt_str) = data.archived_date {
-        Some(dt_str) => match NaiveDateTime::parse_from_str(&dt_str, "%+") {
+        match NaiveDateTime::parse_from_str(&dt_str, "%+") {
            Ok(dt) => cipher.set_archived_at(dt, &headers.user.uuid, conn).await?,
            Err(err) => warn!("Error parsing ArchivedDate '{dt_str}': {err}"),
-        },
+        }
        None => cipher.unarchive(&headers.user.uuid, conn).await?,
    }
    if ut != UpdateType::None {
@@ -690,8 +553,16 @@ pub async fn update_cipher_from_data(
                (_, _) => EventType::CipherUpdated,
            };
-            log_event(event_type, &cipher.uuid, org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
+            log_event(
-                .await;
+                event_type as i32,
                &cipher.uuid,
                org_id,
                &headers.user.uuid,
                headers.device.atype,
                &headers.ip.ip,
                conn,
            )
            .await;
        }
        nt.send_cipher_update(
            ut,
@@ -763,7 +634,7 @@ async fn post_ciphers_import(data: Json<ImportData>, headers: Headers, conn: DbC
        let folder_id = relations_map.get(&index).and_then(|i| folders.get(*i).cloned());
        cipher_data.folder_id = folder_id;
-        let mut cipher = Cipher::new(cipher_data.r#type);
+        let mut cipher = Cipher::new(cipher_data.r#type, cipher_data.name.clone());
        update_cipher_from_data(&mut cipher, cipher_data, &headers, None, &conn, &nt, UpdateType::None).await?;
    }
@@ -831,9 +702,6 @@ async fn put_cipher(
        err!("Cipher is not write accessible")
    }
    // Against the cipher we hold rather than the organization the client claims, like upstream
    validate_encrypted_by_user(&data, &headers.user, cipher.organization_uuid.is_some())?;
    update_cipher_from_data(&mut cipher, data, &headers, None, &conn, &nt, UpdateType::SyncCipherUpdate).await?;
    Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, CipherSyncType::User, &conn).await?))
@@ -982,7 +850,7 @@ async fn post_collections_update(
    .await;
    log_event(
-        EventType::CipherUpdatedCollections,
+        EventType::CipherUpdatedCollections as i32,
        &cipher.uuid,
        org_uuid,
        &headers.user.uuid,
@@ -1002,7 +870,7 @@ async fn put_collections_admin(
    headers: Headers,
    conn: DbConn,
    nt: Notify<'_>,
-) -> JsonResult {
+) -> EmptyResult {
    post_collections_admin(cipher_id, data, headers, conn, nt).await
 }
@@ -1013,7 +881,7 @@ async fn post_collections_admin(
    headers: Headers,
    conn: DbConn,
    nt: Notify<'_>,
-) -> JsonResult {
+) -> EmptyResult {
    let data: CollectionsAdminData = data.into_inner();
    let Some(cipher) = Cipher::find_by_uuid(&cipher_id, &conn).await else {
@@ -1062,7 +930,7 @@ async fn post_collections_admin(
    .await;
    log_event(
-        EventType::CipherUpdatedCollections,
+        EventType::CipherUpdatedCollections as i32,
        &cipher.uuid,
        org_uuid,
        &headers.user.uuid,
@@ -1072,7 +940,7 @@ async fn post_collections_admin(
    )
    .await;
-    Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, CipherSyncType::Organization, &conn).await?))
+    Ok(())
 }
 #[derive(Deserialize)]
@@ -1092,7 +960,9 @@ async fn post_cipher_share(
    conn: DbConn,
    nt: Notify<'_>,
 ) -> JsonResult {
-    put_cipher_share(cipher_id, data, headers, conn, nt).await
+    let data: ShareCipherData = data.into_inner();
    share_cipher_by_uuid(&cipher_id, data, &headers, &conn, &nt, None).await
 }
 #[put("/ciphers/<cipher_id>/share", data = "<data>")]
@@ -1105,21 +975,6 @@ async fn put_cipher_share(
 ) -> JsonResult {
    let data: ShareCipherData = data.into_inner();
    // Upstream's `PutShare` checks, before anything is written.
    // Ref: <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Controllers/CiphersController.cs#L899-L912>
    // and <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Models/Request/CipherRequestModel.cs#L498-L519>
    if data.cipher.organization_id.is_none() {
        err!("Cipher OrganizationId is required.")
    }
    if data.collection_ids.is_empty() {
        err!("You must select at least one collection.")
    }
    if !Cipher::find_by_uuid(&cipher_id, &conn).await.is_some_and(|c| c.user_uuid.as_ref() == Some(&headers.user.uuid))
    {
        err_code!("Cipher doesn't exist", Status::NotFound.code)
    }
    validate_encrypted_for_user(&data.cipher, &headers.user.uuid)?;
    share_cipher_by_uuid(&cipher_id, data, &headers, &conn, &nt, None).await
 }
@@ -1139,33 +994,18 @@ async fn put_cipher_share_selected(
 ) -> EmptyResult {
    let mut data: ShareSelectedCipherData = data.into_inner();
    // Upstream's `PutShareMany` checks, before anything is written.
    // Ref: <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Controllers/CiphersController.cs#L1395-L1421>
    // and <https://github.com/bitwarden/server/blob/9030c42bf7d8f9ac2ff9fee85c39588d5eb81499/src/Api/Vault/Models/Request/CipherRequestModel.cs#L560-L604>
    if data.ciphers.is_empty() {
        err!("You must select at least one cipher.")
    }
-    if data.ciphers.iter().any(|c| c.id.is_none() || c.organization_id.is_none()) {
+
        err!("All Ciphers must have an Id and OrganizationId.")
    }
    if data.ciphers.iter().map(|c| &c.organization_id).collect::<HashSet<_>>().len() != 1 {
        err!("All ciphers must be for the same organization.")
    }
    if data.collection_ids.is_empty() {
        err!("You must select at least one collection.")
    }
    for cipher in &data.ciphers {
-        cipher.validate_content(cipher.is_blob())?;
+        if cipher.id.is_none() {
-    }
+            err!("Request missing ids field")
-    for cipher in &data.ciphers {
+        }
        validate_encrypted_for_user(cipher, &headers.user.uuid)?;
    }
    let owned_ciphers = Cipher::find_owned_by_user(&headers.user.uuid, &conn).await;
    for cipher_data in &data.ciphers {
        let Some(cipher) = owned_ciphers.iter().find(|c| cipher_data.id.as_ref() == Some(&c.uuid)) else {
            err!("Trying to share ciphers that you do not own.")
        };
        validate_cipher_update(cipher, cipher_data, &headers, &conn, UpdateType::None).await?;
    }
    while let Some(cipher) = data.ciphers.pop() {
@@ -1212,20 +1052,6 @@ async fn share_cipher_by_uuid(
        err!("Organization mismatch. Please resync the client before updating the cipher")
    }
    // When LastKnownRevisionDate is None, it is a new cipher, so send CipherCreate.
    // If there is an override, like when handling multiple items, we want to prevent a push notification for every single item
    let ut = if let Some(ut) = override_ut {
        ut
    } else if data.cipher.last_known_revision_date.is_some() {
        UpdateType::SyncCipherUpdate
    } else {
        UpdateType::SyncCipherCreate
    };
    // For the same reason, the other checks of saving
    data.cipher.validate_content(data.cipher.is_blob())?;
    validate_cipher_update(&cipher, &data.cipher, headers, conn, ut).await?;
    let mut shared_to_collections = vec![];
    if let Some(organization_id) = &data.cipher.organization_id {
@@ -1244,6 +1070,16 @@ async fn share_cipher_by_uuid(
        }
    }
    // When LastKnownRevisionDate is None, it is a new cipher, so send CipherCreate.
    // If there is an override, like when handling multiple items, we want to prevent a push notification for every single item
    let ut = if let Some(ut) = override_ut {
        ut
    } else if data.cipher.last_known_revision_date.is_some() {
        UpdateType::SyncCipherUpdate
    } else {
        UpdateType::SyncCipherCreate
    };
    update_cipher_from_data(&mut cipher, data.cipher, headers, Some(shared_to_collections), conn, nt, ut).await?;
    Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, CipherSyncType::User, conn).await?))
@@ -1316,10 +1152,6 @@ async fn post_attachment_v2(
    if file_size < 0 {
        err!("Attachment size can't be negative")
    }
    // Matches the "file" upload limit in main.rs, nothing larger can be uploaded
    if file_size > SIZE_525_MB {
        err!("Max file size is 525 MB.")
    }
    let attachment_id = crypto::generate_attachment_id();
    let attachment =
        Attachment::new(attachment_id.clone(), cipher.uuid.clone(), data.file_name, file_size, Some(data.key));
@@ -1503,7 +1335,7 @@ async fn save_attachment(
    if let Some(org_id) = &cipher.organization_uuid {
        log_event(
-            EventType::CipherAttachmentCreated,
+            EventType::CipherAttachmentCreated as i32,
            &cipher.uuid,
            org_id,
            &headers.user.uuid,
@@ -1864,7 +1696,7 @@ async fn purge_org_vault(
            nt.send_user_update(UpdateType::SyncVault, &user, headers.device.push_uuid.as_ref(), &conn).await;
            log_event(
-                EventType::OrganizationPurgedVault,
+                EventType::OrganizationPurgedVault as i32,
                &organization.org_id,
                &organization.org_id,
                &user.uuid,
@@ -1992,9 +1824,9 @@ async fn delete_cipher_by_uuid(
        let event_type = if *delete_options == CipherDeleteOptions::SoftSingle
            || *delete_options == CipherDeleteOptions::SoftMulti
        {
-            EventType::CipherSoftDeleted
+            EventType::CipherSoftDeleted as i32
        } else {
-            EventType::CipherDeleted
+            EventType::CipherDeleted as i32
        };
        log_event(event_type, &cipher.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
@@ -2007,7 +1839,7 @@ async fn delete_cipher_by_uuid(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct CipherIdsData {
-    ids: HashSet<CipherId>,
+    ids: Vec<CipherId>,
 }
 async fn delete_multiple_ciphers(
@@ -2063,7 +1895,7 @@ async fn restore_cipher_by_uuid(
    if let Some(org_id) = &cipher.organization_uuid {
        log_event(
-            EventType::CipherRestored,
+            EventType::CipherRestored as i32,
            &cipher.uuid.clone(),
            org_id,
            &headers.user.uuid,
@@ -2140,7 +1972,7 @@ async fn delete_cipher_attachment_by_id(
    if let Some(ref org_id) = cipher.organization_uuid {
        log_event(
-            EventType::CipherAttachmentDeleted,
+            EventType::CipherAttachmentDeleted as i32,
            &cipher.uuid,
            org_id,
            &headers.user.uuid,
@@ -2318,15 +2150,8 @@ impl CipherSyncData {
            }
        }
        // Generate a HashMap with the Organization UUID as key and the Membership record
        let members: HashMap<OrganizationId, Membership> = Membership::find_confirmed_by_user(user_id, conn)
            .await
            .into_iter()
            .map(|m| (m.org_uuid.clone(), m))
            .collect();
        // Generate a list of Cipher UUID's containing a Vec with one or more Attachment records
-        let orgs: Vec<OrganizationId> = members.keys().cloned().collect();
+        let orgs = Membership::get_orgs_by_user(user_id, conn).await;
        let attachments = Attachment::find_all_by_user_and_orgs(user_id, &orgs, conn).await;
        let mut cipher_attachments: HashMap<CipherId, Vec<Attachment>> = HashMap::with_capacity(attachments.len());
        for attachment in attachments {
@@ -2341,6 +2166,13 @@ impl CipherSyncData {
            cipher_collections.entry(cipher).or_default().push(collection);
        }
        // Generate a HashMap with the Organization UUID as key and the Membership record
        let members: HashMap<OrganizationId, Membership> = Membership::find_confirmed_by_user(user_id, conn)
            .await
            .into_iter()
            .map(|m| (m.org_uuid.clone(), m))
            .collect();
        // Generate a HashMap with the User_Collections UUID as key and the CollectionUser record
        let user_collections: HashMap<CollectionId, CollectionUser> = CollectionUser::find_by_user(user_id, conn)
            .await
@@ -6,10 +6,7 @@ use crate::{
    CONFIG,
    api::{
        EmptyResult, JsonResult,
-        core::{
+        core::{CipherSyncData, CipherSyncType},
            CipherSyncData, CipherSyncType,
            accounts::{AuthenticationData, UnlockData},
        },
    },
    auth::{Headers, decode_emergency_access_invite},
    db::{
@@ -228,7 +225,7 @@ async fn send_invite(data: Json<EmergencyAccessInviteData>, headers: Headers, co
    let (grantee_user, new_user) = match User::find_by_mail(&email, &conn).await {
        None => {
            if !CONFIG.invitations_allowed() {
-                err!(format!("Grantee user does not exist: {}", email.escape_debug()))
+                err!(format!("Grantee user does not exist: {email}"))
            }
            if !CONFIG.is_email_domain_allowed(&email) {
@@ -618,7 +615,6 @@ async fn takeover_emergency_access(emer_id: EmergencyAccessId, headers: Headers,
        "kdfMemory": grantor_user.client_kdf_memory,
        "kdfParallelism": grantor_user.client_kdf_parallelism,
        "keyEncrypted": &emergency_access.key_encrypted,
        "salt": grantor_user.master_password_salt(),
        "object": "emergencyAccessTakeover",
    });
@@ -628,13 +624,8 @@ async fn takeover_emergency_access(emer_id: EmergencyAccessId, headers: Headers,
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct EmergencyAccessPasswordData {
-    // Legacy payload
+    new_master_password_hash: String,
-    new_master_password_hash: Option<String>,
+    key: String,
    key: Option<String>,
    // Current payload
    authentication_data: Option<AuthenticationData>,
    unlock_data: Option<UnlockData>,
 }
 #[post("/emergency-access/<emer_id>/password", data = "<data>")]
@@ -647,6 +638,8 @@ async fn password_emergency_access(
    check_emergency_access_enabled()?;
    let data: EmergencyAccessPasswordData = data.into_inner();
    let new_master_password_hash = &data.new_master_password_hash;
    //let key = &data.Key;
    let requesting_user = headers.user;
    let Some(emergency_access) =
@@ -663,23 +656,8 @@ async fn password_emergency_access(
        err!("Grantor user not found.")
    };
    let (new_master_password_hash, new_key) =
        if let (Some(authentication_data), Some(unlock_data)) = (data.authentication_data, data.unlock_data) {
            authentication_data.check(&grantor_user, &unlock_data)?;
            if !authentication_data.kdf.matches_user(&grantor_user) {
                err!("KDF settings do not match the grantor account")
            }
            (authentication_data.master_password_authentication_hash, unlock_data.master_key_wrapped_user_key)
        } else if let (Some(new_master_password_hash), Some(new_key)) = (data.new_master_password_hash, data.key) {
            (new_master_password_hash, new_key)
        } else {
            err!("Invalid request!")
        };
    // change grantor_user password
-    grantor_user.set_password(&new_master_password_hash, Some(new_key), true, None, &conn).await?;
+    grantor_user.set_password(new_master_password_hash, Some(data.key), true, None, &conn).await?;
    grantor_user.save(&conn).await?;
    // Disable TwoFactor providers since they will otherwise block logins
@@ -6,13 +6,12 @@ use serde_json::Value;
 use crate::{
    CONFIG,
-    api::{ApiResult, EmptyResult, JsonResult},
+    api::{EmptyResult, JsonResult},
    auth::{AdminHeaders, Headers},
    db::{
        DbConn, DbPool,
-        models::{Cipher, CipherId, Event, EventType, Membership, MembershipId, OrganizationId, UserId},
+        models::{Cipher, CipherId, Event, Membership, MembershipId, OrganizationId, UserId},
    },
    error::MapResult,
    util::parse_date,
 };
@@ -30,14 +29,6 @@ struct EventRange {
    continuation_token: Option<String>,
 }
 impl EventRange {
    fn date_range(&self) -> ApiResult<(NaiveDateTime, NaiveDateTime)> {
        let start_date = parse_date(&self.start).map_res("Invalid start date")?;
        let end_date = parse_date(self.continuation_token.as_ref().unwrap_or(&self.end)).map_res("Invalid end date")?;
        Ok((start_date, end_date))
    }
 }
 // Upstream: https://github.com/bitwarden/server/blob/9ebe16587175b1c0e9208f84397bb75d0d595510/src/Api/AdminConsole/Controllers/EventsController.cs#L87
 #[get("/organizations/<org_id>/events?<data..>")]
 async fn get_org_events(org_id: OrganizationId, data: EventRange, headers: AdminHeaders, conn: DbConn) -> JsonResult {
@@ -48,7 +39,12 @@ async fn get_org_events(org_id: OrganizationId, data: EventRange, headers: Admin
    // Return an empty vec when we org events are disabled.
    // This prevents client errors
    let events_json: Vec<Value> = if CONFIG.org_events_enabled() {
-        let (start_date, end_date) = data.date_range()?;
+        let start_date = parse_date(&data.start);
        let end_date = if let Some(before_date) = &data.continuation_token {
            parse_date(before_date)
        } else {
            parse_date(&data.end)
        };
        Event::find_by_organization_uuid(&org_id, &start_date, &end_date, &conn)
            .await
@@ -73,7 +69,12 @@ async fn get_cipher_events(cipher_id: CipherId, data: EventRange, headers: Heade
    let events_json: Vec<Value> = if CONFIG.org_events_enabled()
        && Membership::user_has_ge_admin_access_to_cipher(&headers.user.uuid, &cipher_id, &conn).await
    {
-        let (start_date, end_date) = data.date_range()?;
+        let start_date = parse_date(&data.start);
        let end_date = if let Some(before_date) = &data.continuation_token {
            parse_date(before_date)
        } else {
            parse_date(&data.end)
        };
        Event::find_by_cipher_uuid(&cipher_id, &start_date, &end_date, &conn).await.iter().map(Event::to_json).collect()
    } else {
@@ -101,7 +102,12 @@ async fn get_user_events(
    // Return an empty vec when we org events are disabled.
    // This prevents client errors
    let events_json: Vec<Value> = if CONFIG.org_events_enabled() {
-        let (start_date, end_date) = data.date_range()?;
+        let start_date = parse_date(&data.start);
        let end_date = if let Some(before_date) = &data.continuation_token {
            parse_date(before_date)
        } else {
            parse_date(&data.end)
        };
        Event::find_by_org_and_member(&org_id, &member_id, &start_date, &end_date, &conn)
            .await
@@ -162,10 +168,9 @@ async fn post_events_collect(data: Json<Vec<EventCollection>>, headers: Headers,
    }
    for event in data.iter() {
-        let event_date = parse_date(&event.date).map_res("Invalid event date")?;
+        let event_date = parse_date(&event.date);
        // Only the event types upstream accepts from clients, the rest are written server-side.
        match event.r#type {
-            t if t == EventType::UserClientExportedVault as i32 => {
+            1000..=1099 => {
                log_user_event_impl(
                    event.r#type,
                    &headers.user.uuid,
@@ -176,7 +181,7 @@ async fn post_events_collect(data: Json<Vec<EventCollection>>, headers: Headers,
                )
                .await;
            }
-            t if t == EventType::OrganizationClientExportedVault as i32 => {
+            1600..=1699 => {
                // Only allow logging events for an organization the user is actually a member of.
                if let Some(org_id) = &event.organization_id
                    && Membership::find_confirmed_by_user_and_org(&headers.user.uuid, org_id, &conn).await.is_some()
@@ -194,28 +199,7 @@ async fn post_events_collect(data: Json<Vec<EventCollection>>, headers: Headers,
                    .await;
                }
            }
-            // Only the vault notification banner click is accepted from clients. The rest of
+            _ => {
            // the 1500..=1599 range is written server-side and must not be forgeable by a client.
            t if t == EventType::OrganizationUserNotificationBannerActionClicked as i32 => {
                if let Some(org_id) = &event.organization_id
                    && let Some(membership) =
                        Membership::find_confirmed_by_user_and_org(&headers.user.uuid, org_id, &conn).await
                {
                    log_event_impl(
                        event.r#type,
                        &membership.uuid,
                        org_id,
                        &headers.user.uuid,
                        headers.device.atype,
                        Some(event_date),
                        &headers.ip.ip,
                        &conn,
                    )
                    .await;
                }
            }
            // Client-side cipher events (viewed, copied, toggled, autofilled).
            1107..=1114 | 1117 | 1119..=1132 => {
                // The cipher determines the organization the event is logged to, so make sure the
                // user can actually access it instead of trusting the provided cipher uuid.
                if let Some(cipher_uuid) = &event.cipher_id
@@ -236,17 +220,16 @@ async fn post_events_collect(data: Json<Vec<EventCollection>>, headers: Headers,
                    .await;
                }
            }
            _ => {}
        }
    }
    Ok(())
 }
-pub async fn log_user_event(event_type: EventType, user_id: &UserId, device_type: i32, ip: &IpAddr, conn: &DbConn) {
+pub async fn log_user_event(event_type: i32, user_id: &UserId, device_type: i32, ip: &IpAddr, conn: &DbConn) {
    if !CONFIG.org_events_enabled() {
        return;
    }
-    log_user_event_impl(event_type as i32, user_id, device_type, None, ip, conn).await;
+    log_user_event_impl(event_type, user_id, device_type, None, ip, conn).await;
 }
 async fn log_user_event_impl(
@@ -284,7 +267,7 @@ async fn log_user_event_impl(
 }
 pub async fn log_event(
-    event_type: EventType,
+    event_type: i32,
    source_uuid: &str,
    org_id: &OrganizationId,
    act_user_id: &UserId,
@@ -295,7 +278,7 @@ pub async fn log_event(
    if !CONFIG.org_events_enabled() {
        return;
    }
-    log_event_impl(event_type as i32, source_uuid, org_id, act_user_id, device_type, None, ip, conn).await;
+    log_event_impl(event_type, source_uuid, org_id, act_user_id, device_type, None, ip, conn).await;
 }
 #[expect(clippy::too_many_arguments)]
@@ -228,17 +228,14 @@ fn config() -> Json<Value> {
        // Version history:
        // - Individual cipher key encryption: 2024.2.0
        // - Mobile app support for MasterPasswordUnlockData: 2025.8.0
-        "version": "2026.6.0",
+        "version": "2025.12.0",
        "gitHash": option_env!("GIT_REV"),
        "server": {
          "name": "Vaultwarden",
          "url": "https://github.com/dani-garcia/vaultwarden"
        },
        "settings": {
-            "disableUserRegistration": CONFIG.is_signup_disabled(),
+            "disableUserRegistration": CONFIG.is_signup_disabled()
            // When enabled, this setting signals to clients that onboarding interstitials
            // (post-login welcome dialogs, extension install prompts, setup extension redirects, and premium upsell modals) should be suppressed
            "suppressOnboardingInterstitials": CONFIG.client_suppress_onboarding(),
        },
        "environment": {
          "vault": domain,
@@ -254,10 +251,6 @@ fn config() -> Json<Value> {
          "vapidPublicKey": null
        },
        "featureStates": feature_states,
        // Not supported right now
        // Used for by clients to learn if the server requires extra work to establish a connection.
        // See: https://github.com/bitwarden/server/pull/6892 | https://github.com/bitwarden/server/commit/52955d1860b4dfb905f67bbe39d9b10bbd61ded0
        "communication": null,
        "object": "config",
    }))
 }
@@ -1,24 +1,23 @@
 use std::collections::{HashMap, HashSet};
 use num_traits::FromPrimitive;
-use rocket::{Route, http::Status, serde::json::Json};
+use rocket::{Route, serde::json::Json};
 use serde_json::Value;
 use crate::{
    CONFIG,
    api::admin::FAKE_ADMIN_UUID,
    api::{
-        ApiResult, EmptyResult, JsonResult, Notify, PasswordOrOtpData, UpdateType,
+        EmptyResult, JsonResult, Notify, PasswordOrOtpData, UpdateType,
        core::{CipherSyncData, CipherSyncType, accept_org_invite, log_event, two_factor},
    },
    auth::{AdminHeaders, Headers, ManagerHeaders, ManagerHeadersLoose, OrgMemberHeaders, OwnerHeaders, decode_invite},
    db::{
        DbConn,
        models::{
-            Cipher, CipherId, Collection, CollectionCipher, CollectionGroup, CollectionId, CollectionUser, Device,
+            Cipher, CipherId, Collection, CollectionCipher, CollectionGroup, CollectionId, CollectionUser, EventType,
-            EventType, Group, GroupId, GroupUser, Invitation, Membership, MembershipId, MembershipStatus,
+            Group, GroupId, GroupUser, Invitation, Membership, MembershipId, MembershipStatus, MembershipType,
-            MembershipType, OrgPolicy, OrgPolicyType, Organization, OrganizationApiKey, OrganizationId, TwoFactor,
+            OrgPolicy, OrgPolicyType, Organization, OrganizationApiKey, OrganizationId, User, UserId,
            TwoFactorType, User, UserId,
        },
    },
    mail,
@@ -26,13 +25,12 @@ use crate::{
    util::{NumberOrString, convert_json_key_lcase_first},
 };
 use super::accounts::{AuthenticationData, UnlockData};
 pub fn routes() -> Vec<Route> {
    routes![
        get_organization,
        create_organization,
        delete_organization,
        post_delete_organization,
        leave_organization,
        get_user_collections,
        get_org_collections,
@@ -40,10 +38,13 @@ pub fn routes() -> Vec<Route> {
        get_org_collection_detail,
        get_collection_users,
        put_organization,
        post_organization,
        post_organization_collections,
        post_bulk_access_collections,
        post_organization_collection_update,
        put_organization_collection_update,
        delete_organization_collection,
        post_organization_collection_delete,
        bulk_delete_organization_collections,
        post_bulk_collections,
        get_org_details,
@@ -58,6 +59,7 @@ pub fn routes() -> Vec<Route> {
        get_org_user_mini_details,
        get_user,
        edit_member,
        put_member,
        delete_member,
        bulk_delete_member,
        post_org_import,
@@ -67,6 +69,7 @@ pub fn routes() -> Vec<Route> {
        get_master_password_policy,
        get_policy,
        put_policy,
        put_policy_vnext,
        get_plans,
        post_org_keys,
        get_organization_keys,
@@ -82,16 +85,22 @@ pub fn routes() -> Vec<Route> {
        post_groups,
        get_group,
        put_group,
        post_group,
        get_group_details,
        delete_group,
        post_delete_group,
        bulk_delete_groups,
        get_group_members,
        put_group_members,
        post_delete_group_member,
        put_reset_password_enrollment,
        get_reset_password_details,
        put_reset_password,
        put_recover_account,
        get_org_export,
        post_api_key,
        rotate_api_key,
        get_billing_metadata,
        get_billing_warnings,
        get_auto_enroll_status,
        get_self_host_billing_metadata,
@@ -123,6 +132,7 @@ struct FullCollectionData {
    name: String,
    groups: Vec<CollectionGroupData>,
    users: Vec<CollectionMembershipData>,
    id: Option<CollectionId>,
    external_id: Option<String>,
 }
@@ -235,6 +245,16 @@ async fn delete_organization(
    }
 }
 #[post("/organizations/<org_id>/delete", data = "<data>")]
 async fn post_delete_organization(
    org_id: OrganizationId,
    data: Json<PasswordOrOtpData>,
    headers: OwnerHeaders,
    conn: DbConn,
 ) -> EmptyResult {
    delete_organization(org_id, data, headers, conn).await
 }
 #[post("/organizations/<org_id>/leave")]
 async fn leave_organization(org_id: OrganizationId, headers: OrgMemberHeaders, conn: DbConn) -> EmptyResult {
    if headers.membership.status != MembershipStatus::Confirmed as i32 {
@@ -249,7 +269,7 @@ async fn leave_organization(org_id: OrganizationId, headers: OrgMemberHeaders, c
    }
    log_event(
-        EventType::OrganizationUserLeft,
+        EventType::OrganizationUserLeft as i32,
        &membership.uuid,
        &org_id,
        &headers.user.uuid,
@@ -280,6 +300,16 @@ async fn put_organization(
    headers: OwnerHeaders,
    data: Json<OrganizationUpdateData>,
    conn: DbConn,
 ) -> JsonResult {
    post_organization(org_id, headers, data, conn).await
 }
 #[post("/organizations/<org_id>", data = "<data>")]
 async fn post_organization(
    org_id: OrganizationId,
    headers: OwnerHeaders,
    data: Json<OrganizationUpdateData>,
    conn: DbConn,
 ) -> JsonResult {
    if org_id != headers.org_id {
        err!("Organization not found", "Organization id's do not match");
@@ -297,7 +327,7 @@ async fn put_organization(
    org.save(&conn).await?;
    log_event(
-        EventType::OrganizationUpdated,
+        EventType::OrganizationUpdated as i32,
        org_id.as_ref(),
        &org_id,
        &headers.user.uuid,
@@ -361,7 +391,7 @@ async fn get_org_collections(org_id: OrganizationId, headers: ManagerHeadersLoos
    }
    if !headers.membership.has_full_access() {
-        err_code!("Resource not found.", "User does not have full access", Status::NotFound.code);
+        err_code!("Resource not found.", "User does not have full access", rocket::http::Status::NotFound.code);
    }
    Ok(Json(json!({
@@ -385,9 +415,8 @@ async fn get_org_collections_details(org_id: OrganizationId, headers: ManagerHea
    let col_users = CollectionUser::find_by_organization_swap_user_uuid_with_member_uuid(&org_id, &conn).await;
    // Generate a HashMap to get the correct MembershipType per user to determine the manage permission
    // We use the uuid instead of the user_uuid here, since that is what is used in CollectionUser
    // This lists other members for admins, so it must not depend on the membership status
    let membership_type: HashMap<MembershipId, i32> =
-        Membership::find_by_org(&org_id, &conn).await.into_iter().map(|m| (m.uuid, m.atype)).collect();
+        Membership::find_confirmed_by_org(&org_id, &conn).await.into_iter().map(|m| (m.uuid, m.atype)).collect();
    // check if current user has full access to the organization (either directly or via any group)
    let has_full_access_to_org = member.has_full_access()
@@ -485,7 +514,7 @@ async fn post_organization_collections(
    collection.save(&conn).await?;
    log_event(
-        EventType::CollectionCreated,
+        EventType::CollectionCreated as i32,
        &collection.uuid,
        &org_id,
        &headers.user.uuid,
@@ -568,7 +597,7 @@ async fn post_bulk_access_collections(
        collection.save(&conn).await?;
        log_event(
-            EventType::CollectionUpdated,
+            EventType::CollectionUpdated as i32,
            &collection.uuid,
            &org_id,
            &headers.user.uuid,
@@ -610,6 +639,17 @@ async fn put_organization_collection_update(
    headers: ManagerHeaders,
    data: Json<FullCollectionData>,
    conn: DbConn,
 ) -> JsonResult {
    post_organization_collection_update(org_id, col_id, headers, data, conn).await
 }
 #[post("/organizations/<org_id>/collections/<col_id>", data = "<data>", rank = 2)]
 async fn post_organization_collection_update(
    org_id: OrganizationId,
    col_id: CollectionId,
    headers: ManagerHeaders,
    data: Json<FullCollectionData>,
    conn: DbConn,
 ) -> JsonResult {
    if org_id != headers.org_id {
        err!("Organization not found", "Organization id's do not match");
@@ -634,7 +674,7 @@ async fn put_organization_collection_update(
    collection.save(&conn).await?;
    log_event(
-        EventType::CollectionUpdated,
+        EventType::CollectionUpdated as i32,
        &collection.uuid,
        &org_id,
        &headers.user.uuid,
@@ -683,7 +723,7 @@ async fn delete_organization_collection_impl(
        err!("Collection not found", "Collection does not exist or does not belong to this organization")
    };
    log_event(
-        EventType::CollectionDeleted,
+        EventType::CollectionDeleted as i32,
        &collection.uuid,
        org_id,
        &headers.user.uuid,
@@ -705,6 +745,16 @@ async fn delete_organization_collection(
    delete_organization_collection_impl(&org_id, &col_id, &headers, &conn).await
 }
 #[post("/organizations/<org_id>/collections/<col_id>/delete")]
 async fn post_organization_collection_delete(
    org_id: OrganizationId,
    col_id: CollectionId,
    headers: ManagerHeaders,
    conn: DbConn,
 ) -> EmptyResult {
    delete_organization_collection_impl(&org_id, &col_id, &headers, &conn).await
 }
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 struct BulkCollectionIds {
@@ -768,9 +818,11 @@ async fn get_org_collection_detail(
            // Generate a HashMap to get the correct MembershipType per user to determine the manage permission
            // We use the uuid instead of the user_uuid here, since that is what is used in CollectionUser
-            // This lists other members for admins, so it must not depend on the membership status
+            let membership_type: HashMap<MembershipId, i32> = Membership::find_confirmed_by_org(&org_id, &conn)
-            let membership_type: HashMap<MembershipId, i32> =
+                .await
-                Membership::find_by_org(&org_id, &conn).await.into_iter().map(|m| (m.uuid, m.atype)).collect();
+                .into_iter()
                .map(|m| (m.uuid, m.atype))
                .collect();
            let users: Vec<Value> =
                CollectionUser::find_by_org_and_coll_swap_user_uuid_with_member_uuid(&org_id, &collection.uuid, &conn)
@@ -835,11 +887,11 @@ struct OrgIdData {
 #[get("/ciphers/organization-details?<data..>")]
 async fn get_org_details(data: OrgIdData, headers: ManagerHeadersLoose, conn: DbConn) -> JsonResult {
    if data.organization_id != headers.membership.org_uuid {
-        err_code!("Resource not found.", "Organization id's do not match", Status::NotFound.code);
+        err_code!("Resource not found.", "Organization id's do not match", rocket::http::Status::NotFound.code);
    }
    if !headers.membership.has_full_access() {
-        err_code!("Resource not found.", "User does not have full access", Status::NotFound.code);
+        err_code!("Resource not found.", "User does not have full access", rocket::http::Status::NotFound.code);
    }
    Ok(Json(json!({
@@ -903,14 +955,13 @@ async fn get_members(
    }
    if !headers.membership.has_full_access() {
-        err_code!("Resource not found.", "User does not have full access", Status::NotFound.code);
+        err_code!("Resource not found.", "User does not have full access", rocket::http::Status::NotFound.code);
    }
    let mut users_json = Vec::new();
    for u in Membership::find_by_org(&org_id, &conn).await {
        // The user can be a manager instead of an admin, but we've checked above that they have full access
        users_json.push(
-            u.to_json_details_for_admin(
+            u.to_json_user_details(
                data.include_collections.unwrap_or(false),
                data.include_groups.unwrap_or(false),
                &conn,
@@ -1024,13 +1075,13 @@ async fn send_invite(
            && data.permissions.get("deleteAnyCollection") == Some(&json!(true))
            && data.permissions.get("createNewCollections") == Some(&json!(true)));
-    let mut user_created: bool;
+    let mut user_created: bool = false;
    for email in &data.emails {
        let mut member_status = MembershipStatus::Invited as i32;
        let user = match User::find_by_mail(email, &conn).await {
            None => {
                if !CONFIG.invitations_allowed() {
-                    err!(format!("User does not exist: {}", email.escape_debug()))
+                    err!(format!("User does not exist: {email}"))
                }
                if !CONFIG.is_email_domain_allowed(email) {
@@ -1048,7 +1099,7 @@ async fn send_invite(
            }
            Some(user) => {
                if Membership::find_by_user_and_org(&user.uuid, &org_id, &conn).await.is_some() {
-                    err!(format!("User already in organization: {}", email.escape_debug()))
+                    err!(format!("User already in organization: {email}"))
                }
                if !CONFIG.mail_enabled() {
@@ -1059,7 +1110,6 @@ async fn send_invite(
                        member_status = MembershipStatus::Accepted as i32;
                    }
                }
                user_created = false;
                user
            }
        };
@@ -1098,7 +1148,7 @@ async fn send_invite(
        }
        log_event(
-            EventType::OrganizationUserInvited,
+            EventType::OrganizationUserInvited as i32,
            &new_member.uuid,
            &org_id,
            &headers.user.uuid,
@@ -1323,9 +1373,7 @@ async fn bulk_confirm_invite(
    match data.keys {
        Some(keys) => {
            for invite in keys {
-                let Some(member_id) = invite.id else {
+                let member_id = invite.id.unwrap();
                    err!("Member id is required")
                };
                let user_key = invite.key.unwrap_or_default();
                let err_msg = match confirm_invite_impl(&org_id, &member_id, &user_key, &headers, &conn, &nt).await {
                    Ok(()) => String::new(),
@@ -1399,7 +1447,7 @@ async fn confirm_invite_impl(
    OrgPolicy::check_user_allowed(&member_to_confirm, "confirm", conn).await?;
    log_event(
-        EventType::OrganizationUserConfirmed,
+        EventType::OrganizationUserConfirmed as i32,
        &member_to_confirm.uuid,
        org_id,
        &headers.user.uuid,
@@ -1467,9 +1515,7 @@ async fn get_user(
    // In this case, when groups are requested we also need to include collections.
    // Else these will not be shown in the interface, and could lead to missing collections when saved.
    let include_groups = data.include_groups.unwrap_or(false);
-    Ok(Json(
+    Ok(Json(user.to_json_user_details(data.include_collections.unwrap_or(include_groups), include_groups, &conn).await))
        user.to_json_details_for_admin(data.include_collections.unwrap_or(include_groups), include_groups, &conn).await,
    ))
 }
 #[derive(Deserialize)]
@@ -1483,6 +1529,17 @@ struct EditUserData {
 }
 #[put("/organizations/<org_id>/users/<member_id>", data = "<data>", rank = 1)]
 async fn put_member(
    org_id: OrganizationId,
    member_id: MembershipId,
    data: Json<EditUserData>,
    headers: AdminHeaders,
    conn: DbConn,
 ) -> EmptyResult {
    edit_member(org_id, member_id, data, headers, conn).await
 }
 #[post("/organizations/<org_id>/users/<member_id>", data = "<data>", rank = 1)]
 async fn edit_member(
    org_id: OrganizationId,
    member_id: MembershipId,
@@ -1580,7 +1637,7 @@ async fn edit_member(
    }
    log_event(
-        EventType::OrganizationUserUpdated,
+        EventType::OrganizationUserUpdated as i32,
        &member_to_edit.uuid,
        &org_id,
        &headers.user.uuid,
@@ -1667,7 +1724,7 @@ async fn delete_member_impl(
    }
    log_event(
-        EventType::OrganizationUserRemoved,
+        EventType::OrganizationUserRemoved as i32,
        &member_to_delete.uuid,
        org_id,
        &headers.user.uuid,
@@ -1736,22 +1793,11 @@ async fn bulk_public_keys(
 use super::ciphers::CipherData;
 use super::ciphers::update_cipher_from_data;
 // The import endpoint only ever uses the name/id/external_id of a collection.
 // Bitwarden's own server ignores `groups`/`users` here too, so do not make them
 // mandatory: clients are free to leave them out.
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ImportCollectionData {
    name: String,
    id: Option<CollectionId>,
    external_id: Option<String>,
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ImportData {
    ciphers: Vec<CipherData>,
-    collections: Vec<ImportCollectionData>,
+    collections: Vec<FullCollectionData>,
    collection_relationships: Vec<RelationsData>,
 }
@@ -1777,10 +1823,6 @@ async fn post_org_import(
    if org_id != headers.membership.org_uuid {
        err!("Organization not found", "Organization id's do not match");
    }
    // OrgMemberHeaders also allows invited and accepted members, which are not allowed to import
    if headers.membership.status != MembershipStatus::Confirmed as i32 {
        err!("You need to be a Member of the Organization to call this endpoint")
    }
    let data: ImportData = data.into_inner();
    // Validate the import before continuing
@@ -1831,7 +1873,7 @@ async fn post_org_import(
        cipher_data.folder_id = None;
        // Replace the client-provided, unvalidated organizationId with the real target org
        cipher_data.organization_id = Some(org_id.clone());
-        let mut cipher = Cipher::new(cipher_data.r#type);
+        let mut cipher = Cipher::new(cipher_data.r#type, cipher_data.name.clone());
        update_cipher_from_data(
            &mut cipher,
            cipher_data,
@@ -1862,7 +1904,7 @@ async fn post_org_import(
 #[serde(rename_all = "camelCase")]
 struct BulkCollectionsData {
    organization_id: OrganizationId,
-    cipher_ids: HashSet<CipherId>,
+    cipher_ids: Vec<CipherId>,
    collection_ids: HashSet<CollectionId>,
    remove_collections: bool,
 }
@@ -2102,7 +2144,7 @@ async fn put_policy(
                }
                log_event(
-                    EventType::OrganizationUserRemoved,
+                    EventType::OrganizationUserRemoved as i32,
                    &member.uuid,
                    &org_id,
                    &headers.user.uuid,
@@ -2128,7 +2170,7 @@ async fn put_policy(
    policy.save(&conn).await?;
    log_event(
-        EventType::PolicyUpdated,
+        EventType::PolicyUpdated as i32,
        policy.uuid.as_ref(),
        &org_id,
        &headers.user.uuid,
@@ -2141,6 +2183,18 @@ async fn put_policy(
    Ok(Json(policy.to_json()))
 }
 // Deprecated with client v2026.5.0
 #[put("/organizations/<org_id>/policies/<pol_type>/vnext", data = "<data>")]
 async fn put_policy_vnext(
    org_id: OrganizationId,
    pol_type: i32,
    data: Json<PutPolicy>,
    headers: AdminHeaders,
    conn: DbConn,
 ) -> JsonResult {
    put_policy(org_id, pol_type, data, headers, conn).await
 }
 #[get("/plans")]
 fn get_plans() -> Json<Value> {
    // Respond with a minimal json just enough to allow the creation of an new organization.
@@ -2169,6 +2223,12 @@ fn get_plans() -> Json<Value> {
    }))
 }
 #[get("/organizations/<_org_id>/billing/metadata")]
 fn get_billing_metadata(_org_id: OrganizationId, _headers: OrgMemberHeaders) -> Json<Value> {
    // Prevent a 404 error, which also causes Javascript errors.
    Json(empty_data_json())
 }
 #[get("/organizations/<_org_id>/billing/vnext/warnings")]
 fn get_billing_warnings(_org_id: OrganizationId, _headers: OrgMemberHeaders) -> Json<Value> {
    Json(json!({
@@ -2188,6 +2248,14 @@ fn get_self_host_billing_metadata(_org_id: OrganizationId, _headers: OrgMemberHe
    }))
 }
 fn empty_data_json() -> Value {
    json!({
        "object": "list",
        "data": [],
        "continuationToken": null
    })
 }
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 struct BulkRevokeMembershipIds {
@@ -2271,7 +2339,7 @@ async fn revoke_member_impl(
            member.save(conn).await?;
            log_event(
-                EventType::OrganizationUserRevoked,
+                EventType::OrganizationUserRevoked as i32,
                &member.uuid,
                org_id,
                &headers.user.uuid,
@@ -2369,7 +2437,7 @@ async fn restore_member_impl(
            member.save(conn).await?;
            log_event(
-                EventType::OrganizationUserRestored,
+                EventType::OrganizationUserRestored as i32,
                &member.uuid,
                org_id,
                &headers.user.uuid,
@@ -2408,7 +2476,7 @@ async fn get_groups_data(
            || Collection::has_manageable_collection_by_user(&org_id, &headers.membership.user_uuid, &conn).await
    };
    if !allowed {
-        err_code!("Resource not found.", "User does not have access", Status::NotFound.code);
+        err_code!("Resource not found.", "User does not have access", rocket::http::Status::NotFound.code);
    }
    let groups: Vec<Value> = if CONFIG.org_groups_enabled() {
@@ -2506,6 +2574,17 @@ impl CollectionData {
    }
 }
 #[post("/organizations/<org_id>/groups/<group_id>", data = "<data>")]
 async fn post_group(
    org_id: OrganizationId,
    group_id: GroupId,
    data: Json<GroupRequest>,
    headers: AdminHeaders,
    conn: DbConn,
 ) -> JsonResult {
    put_group(org_id, group_id, data, headers, conn).await
 }
 #[post("/organizations/<org_id>/groups", data = "<data>")]
 async fn post_groups(
    org_id: OrganizationId,
@@ -2526,7 +2605,7 @@ async fn post_groups(
    let group = group_request.to_group(&org_id);
    log_event(
-        EventType::GroupCreated,
+        EventType::GroupCreated as i32,
        &group.uuid,
        &org_id,
        &headers.user.uuid,
@@ -2567,7 +2646,7 @@ async fn put_group(
    GroupUser::delete_all_by_group(&group_id, &org_id, &conn).await?;
    log_event(
-        EventType::GroupUpdated,
+        EventType::GroupUpdated as i32,
        &updated_group.uuid,
        &org_id,
        &headers.user.uuid,
@@ -2600,7 +2679,7 @@ async fn add_update_group(
        user_entry.save(conn).await?;
        log_event(
-            EventType::OrganizationUserUpdatedGroups,
+            EventType::OrganizationUserUpdatedGroups as i32,
            &assigned_member,
            &org_id,
            &headers.user.uuid,
@@ -2615,6 +2694,7 @@ async fn add_update_group(
        "id": group.uuid,
        "organizationId": group.organizations_uuid,
        "name": group.name,
        "accessAll": group.access_all,
        "externalId": group.external_id,
        "object": "group"
    })))
@@ -2641,6 +2721,16 @@ async fn get_group_details(
    Ok(Json(group.to_json_details(&conn).await))
 }
 #[post("/organizations/<org_id>/groups/<group_id>/delete")]
 async fn post_delete_group(
    org_id: OrganizationId,
    group_id: GroupId,
    headers: AdminHeaders,
    conn: DbConn,
 ) -> EmptyResult {
    delete_group_impl(&org_id, &group_id, &headers, &conn).await
 }
 #[delete("/organizations/<org_id>/groups/<group_id>")]
 async fn delete_group(org_id: OrganizationId, group_id: GroupId, headers: AdminHeaders, conn: DbConn) -> EmptyResult {
    delete_group_impl(&org_id, &group_id, &headers, &conn).await
@@ -2664,7 +2754,7 @@ async fn delete_group_impl(
    };
    log_event(
-        EventType::GroupDeleted,
+        EventType::GroupDeleted as i32,
        &group.uuid,
        org_id,
        &headers.user.uuid,
@@ -2742,6 +2832,90 @@ async fn get_group_members(
    Ok(Json(json!(group_members)))
 }
 #[put("/organizations/<org_id>/groups/<group_id>/users", data = "<data>")]
 async fn put_group_members(
    org_id: OrganizationId,
    group_id: GroupId,
    headers: AdminHeaders,
    data: Json<Vec<MembershipId>>,
    conn: DbConn,
 ) -> EmptyResult {
    if org_id != headers.org_id {
        err!("Organization not found", "Organization id's do not match");
    }
    if !CONFIG.org_groups_enabled() {
        err!("Group support is disabled");
    }
    if Group::find_by_uuid_and_org(&group_id, &org_id, &conn).await.is_none() {
        err!("Group could not be found!", "Group uuid is invalid or does not belong to the organization")
    }
    let assigned_members = data.into_inner();
    let org_memberships = Membership::find_by_org(&org_id, &conn).await;
    let org_membership_ids: HashSet<&MembershipId> = org_memberships.iter().map(|m| &m.uuid).collect();
    if let Some(e) = assigned_members.iter().find(|m| !org_membership_ids.contains(m)) {
        err!("Invalid member", format!("Member {} does not belong to organization {}!", e, org_id))
    }
    GroupUser::delete_all_by_group(&group_id, &org_id, &conn).await?;
    for assigned_member in assigned_members {
        let mut user_entry = GroupUser::new(group_id.clone(), assigned_member.clone());
        user_entry.save(&conn).await?;
        log_event(
            EventType::OrganizationUserUpdatedGroups as i32,
            &assigned_member,
            &org_id,
            &headers.user.uuid,
            headers.device.atype,
            &headers.ip.ip,
            &conn,
        )
        .await;
    }
    Ok(())
 }
 #[post("/organizations/<org_id>/groups/<group_id>/delete-user/<member_id>")]
 async fn post_delete_group_member(
    org_id: OrganizationId,
    group_id: GroupId,
    member_id: MembershipId,
    headers: AdminHeaders,
    conn: DbConn,
 ) -> EmptyResult {
    if org_id != headers.org_id {
        err!("Organization not found", "Organization id's do not match");
    }
    if !CONFIG.org_groups_enabled() {
        err!("Group support is disabled");
    }
    if Membership::find_by_uuid_and_org(&member_id, &org_id, &conn).await.is_none() {
        err!("User could not be found or does not belong to the organization.");
    }
    if Group::find_by_uuid_and_org(&group_id, &org_id, &conn).await.is_none() {
        err!("Group could not be found or does not belong to the organization.");
    }
    log_event(
        EventType::OrganizationUserUpdatedGroups as i32,
        &member_id,
        &org_id,
        &headers.user.uuid,
        headers.device.atype,
        &headers.ip.ip,
        &conn,
    )
    .await;
    GroupUser::delete_by_group_and_member(&group_id, &member_id, &conn).await
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct OrganizationUserResetPasswordEnrollmentRequest {
@@ -2753,13 +2927,8 @@ struct OrganizationUserResetPasswordEnrollmentRequest {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct OrganizationUserRecoverAccountRequest {
-    // Legacy payload
+    new_master_password_hash: String,
-    new_master_password_hash: Option<String>,
+    key: String,
    key: Option<String>,
    // Current payload
    authentication_data: Option<AuthenticationData>,
    unlock_data: Option<UnlockData>,
    #[serde(default)]
    reset_master_password: bool,
@@ -2771,26 +2940,8 @@ struct OrganizationUserRecoverAccountRequest {
 // But the clients do not seem to use this at all
 // Just add it here in case they will
 #[get("/organizations/<org_id>/public-key")]
-async fn get_organization_public_key(
+async fn get_organization_public_key(org_id: OrganizationId, headers: OrgMemberHeaders, conn: DbConn) -> JsonResult {
-    org_id: OrganizationId,
+    if org_id != headers.membership.org_uuid {
    headers: Headers,
    member: Result<OrgMemberHeaders, &'static str>,
    conn: DbConn,
 ) -> JsonResult {
    // SSO users without an org get the fake one, whose key the v2 JIT password flow fetches anyway
    if org_id.eq_ignore_ascii_case(FAKE_SSO_IDENTIFIER) && headers.user.private_key.is_none() {
        return Ok(Json(json!({
            "object": "organizationPublicKey",
            "publicKey": fake_sso_org_public_key().await?,
        })));
    }
    let member = match member {
        Ok(member) => member,
        // The guard already logged it
        Err(e) => return Err(crate::error::Error::new_msg(e).with_code(Status::Unauthorized.code)),
    };
    if org_id != member.membership.org_uuid {
        err!("Organization not found", "Organization id's do not match");
    }
    let Some(org) = Organization::find_by_uuid(&org_id, &conn).await else {
@@ -2803,30 +2954,11 @@ async fn get_organization_public_key(
    })))
 }
 /// The SDK only uses this key to wrap an account recovery key that it never sends for the fake org,
 /// so it is made once and its private half dropped.
 async fn fake_sso_org_public_key() -> ApiResult<String> {
    static PUBLIC_KEY: std::sync::LazyLock<Option<String>> = std::sync::LazyLock::new(|| {
        let der = openssl::rsa::Rsa::generate(2048).and_then(|rsa| rsa.public_key_to_der()).ok()?;
        Some(data_encoding::BASE64.encode(&der))
    });
    let Ok(Some(public_key)) = tokio::task::spawn_blocking(|| PUBLIC_KEY.clone()).await else {
        err!("Failed to generate the organization key")
    };
    Ok(public_key)
 }
 // Obsolete - Renamed to public-key (2023.8), left for backwards compatibility with older clients
 // https://github.com/bitwarden/server/blob/9ebe16587175b1c0e9208f84397bb75d0d595510/src/Api/AdminConsole/Controllers/OrganizationsController.cs#L487-L492
 #[get("/organizations/<org_id>/keys")]
-async fn get_organization_keys(
+async fn get_organization_keys(org_id: OrganizationId, headers: OrgMemberHeaders, conn: DbConn) -> JsonResult {
-    org_id: OrganizationId,
+    get_organization_public_key(org_id, headers, conn).await
    headers: Headers,
    member: Result<OrgMemberHeaders, &'static str>,
    conn: DbConn,
 ) -> JsonResult {
    get_organization_public_key(org_id, headers, member, conn).await
 }
 // Will allow to reset 2FA too
@@ -2839,6 +2971,24 @@ async fn put_recover_account(
    data: Json<OrganizationUserRecoverAccountRequest>,
    conn: DbConn,
    nt: Notify<'_>,
 ) -> EmptyResult {
    let req = data.into_inner();
    if req.reset_master_password && !req.reset_two_factor {
        recover_account(org_id, member_id, headers, req, conn, nt).await
    } else {
        err!("Unsupported operation")
    }
 }
 // Deprecated since `v2026.4.2`
 #[put("/organizations/<org_id>/users/<member_id>/reset-password", data = "<data>")]
 async fn put_reset_password(
    org_id: OrganizationId,
    member_id: MembershipId,
    headers: AdminHeaders,
    data: Json<OrganizationUserRecoverAccountRequest>,
    conn: DbConn,
    nt: Notify<'_>,
 ) -> EmptyResult {
    recover_account(org_id, member_id, headers, data.into_inner(), conn, nt).await
 }
@@ -2847,7 +2997,7 @@ async fn recover_account(
    org_id: OrganizationId,
    member_id: MembershipId,
    headers: AdminHeaders,
-    req: OrganizationUserRecoverAccountRequest,
+    reset_request: OrganizationUserRecoverAccountRequest,
    conn: DbConn,
    nt: Notify<'_>,
 ) -> EmptyResult {
@@ -2862,7 +3012,7 @@ async fn recover_account(
        err!("User to reset isn't member of required organization")
    };
-    let Some(mut user) = User::find_by_uuid(&member.user_uuid, &conn).await else {
+    let Some(user) = User::find_by_uuid(&member.user_uuid, &conn).await else {
        err!("User not found")
    };
@@ -2875,75 +3025,29 @@ async fn recover_account(
        err!("Organization user must be confirmed for password reset functionality");
    }
-    let fallback_2fa_email =
+    // Sending email before resetting password to ensure working email configuration and the resulting
-        if req.reset_two_factor && CONFIG.mail_enabled() && CONFIG.email_2fa_auto_fallback() && user.verified() {
+    // user notification. Also this might add some protection against security flaws and misuse
-            TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email, &conn).await.is_none()
+    if let Err(e) = mail::send_admin_reset_password(&user.email, user.display_name(), &org.name).await {
        } else {
            false
        };
    // Check the new password before the email below, so that a rejected request doesn't tell the user
    // their password was reset
    let new_password = if req.reset_master_password {
        let (new_master_password_hash, new_key) = if let (Some(authentication_data), Some(unlock_data)) =
            (req.authentication_data, req.unlock_data)
        {
            authentication_data.check(&user, &unlock_data)?;
            if !authentication_data.kdf.matches_user(&user) {
                err!("KDF settings do not match the user account")
            }
            (authentication_data.master_password_authentication_hash, unlock_data.master_key_wrapped_user_key)
        } else if let (Some(new_master_password_hash), Some(new_key)) = (req.new_master_password_hash, req.key) {
            (new_master_password_hash, new_key)
        } else {
            err_code!("Unprocessable request", "Missing fields to reset password", Status::UnprocessableEntity.code);
        };
        Some((new_master_password_hash, new_key))
    } else {
        None
    };
    // Sending email first ensure working email configuration and the resulting user notification.
    // Also this might add some protection against security flaws and misuse
    if let Err(e) = mail::send_admin_account_recovery(
        &user.email,
        user.display_name(),
        &org.name,
        req.reset_master_password,
        req.reset_two_factor,
        fallback_2fa_email,
    )
    .await
    {
        err!(format!("Error sending user reset password email: {e:#?}"));
    }
-    if let Some((new_master_password_hash, new_key)) = new_password {
+    let mut user = user;
-        user.set_password(&new_master_password_hash, Some(new_key), true, None, &conn).await?;
+    user.set_password(reset_request.new_master_password_hash.as_str(), Some(reset_request.key), true, None, &conn)
-    }
+        .await?;
    if req.reset_two_factor {
        TwoFactor::delete_all_by_user(&user.uuid, &conn).await?;
        Device::clear_twofactor_remember_by_user(&user.uuid, &conn).await?;
        if !fallback_2fa_email || two_factor::email::find_and_activate_email_2fa(&user.uuid, &conn).await.is_err() {
            two_factor::enforce_2fa_policy(&user, &headers.user.uuid, headers.device.atype, &headers.ip.ip, &conn)
                .await?;
        }
    }
    user.save(&conn).await?;
    nt.send_logout(&user, None, &conn).await;
-    if req.reset_master_password {
+    log_event(
-        headers.log_event(EventType::OrganizationUserAdminResetPassword, &member_id, &org_id, &conn).await;
+        EventType::OrganizationUserAdminResetPassword as i32,
-    }
+        &member_id,
-
+        &org_id,
-    if req.reset_two_factor {
+        &headers.user.uuid,
-        headers.log_event(EventType::OrganizationUserAdminResetTwoFactor, &member_id, &org_id, &conn).await;
+        headers.device.atype,
-    }
+        &headers.ip.ip,
        &conn,
    )
    .await;
    Ok(())
 }
@@ -2980,7 +3084,6 @@ async fn get_reset_password_details(
        "kdfIterations": user.client_kdf_iter,
        "kdfMemory": user.client_kdf_memory,
        "kdfParallelism": user.client_kdf_parallelism,
        "masterPasswordSalt": user.master_password_salt(),
        "resetPasswordKey": member.reset_password_key,
        "encryptedPrivateKey": org.private_key,
    })))
@@ -3063,9 +3166,9 @@ async fn put_reset_password_enrollment(
    membership.save(&conn).await?;
    let event_type = if membership.reset_password_key.is_some() {
-        EventType::OrganizationUserResetPasswordEnroll
+        EventType::OrganizationUserResetPasswordEnroll as i32
    } else {
-        EventType::OrganizationUserResetPasswordWithdraw
+        EventType::OrganizationUserResetPasswordWithdraw as i32
    };
    log_event(event_type, &membership.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, &conn)
@@ -3096,7 +3199,7 @@ async fn api_key(
    org_id: &OrganizationId,
    data: Json<PasswordOrOtpData>,
    rotate: bool,
-    headers: OwnerHeaders,
+    headers: AdminHeaders,
    conn: DbConn,
 ) -> JsonResult {
    if org_id != &headers.org_id {
@@ -3105,7 +3208,7 @@ async fn api_key(
    let data: PasswordOrOtpData = data.into_inner();
    let user = headers.user;
-    // Validate the owner users password/otp
+    // Validate the admin users password/otp
    data.validate(&user, true, &conn).await?;
    let org_api_key = if let Some(mut org_api_key) = OrganizationApiKey::find_by_org_uuid(org_id, &conn).await {
@@ -3133,7 +3236,7 @@ async fn api_key(
 async fn post_api_key(
    org_id: OrganizationId,
    data: Json<PasswordOrOtpData>,
-    headers: OwnerHeaders,
+    headers: AdminHeaders,
    conn: DbConn,
 ) -> JsonResult {
    api_key(&org_id, data, false, headers, conn).await
@@ -3143,7 +3246,7 @@ async fn post_api_key(
 async fn rotate_api_key(
    org_id: OrganizationId,
    data: Json<PasswordOrOtpData>,
-    headers: OwnerHeaders,
+    headers: AdminHeaders,
    conn: DbConn,
 ) -> JsonResult {
    api_key(&org_id, data, true, headers, conn).await
@@ -58,13 +58,25 @@ async fn ldap_import(data: Json<OrgImportData>, token: PublicToken, conn: DbConn
    let org_id = token.0;
    let data = data.into_inner();
    // Like upstream, the import never removes Owners, so it doesn't revoke or restore them either.
    for user_data in &data.members {
        let mut user_created: bool = false;
        if user_data.deleted {
            // If user is marked for deletion and it exists, revoke it
            if let Some(mut member) = Membership::find_by_email_and_org(&user_data.email, &org_id, &conn).await {
-                let revoked = member.atype != MembershipType::Owner && member.revoke();
+                // Only revoke a user if it is not the last confirmed owner
                let revoked = if member.atype == MembershipType::Owner
                    && member.status == MembershipStatus::Confirmed as i32
                {
                    if Membership::count_confirmed_by_org_and_type(&org_id, MembershipType::Owner, &conn).await <= 1 {
                        warn!("Can't revoke the last owner");
                        false
                    } else {
                        member.revoke()
                    }
                } else {
                    member.revoke()
                };
                let ext_modified = member.set_external_id(Some(user_data.external_id.clone()));
                if revoked || ext_modified {
                    member.save(&conn).await?;
@@ -72,7 +84,7 @@ async fn ldap_import(data: Json<OrgImportData>, token: PublicToken, conn: DbConn
            }
        // If user is part of the organization, restore it
        } else if let Some(mut member) = Membership::find_by_email_and_org(&user_data.email, &org_id, &conn).await {
-            let mut restored = member.atype != MembershipType::Owner && member.restore();
+            let mut restored = member.restore();
            let ext_modified = member.set_external_id(Some(user_data.external_id.clone()));
            // Enforce org policies as every other restore path does.
            // If the user is not allowed, we revoke again and continue so the external_id is still updated.
@@ -137,13 +149,9 @@ async fn ldap_import(data: Json<OrgImportData>, token: PublicToken, conn: DbConn
    if CONFIG.org_groups_enabled() {
        for group_data in &data.groups {
-            let group_uuid = if let Some(mut group) =
+            let group_uuid = if let Some(group) =
                Group::find_by_external_id_and_org(&group_data.external_id, &org_id, &conn).await
            {
                if group.name != group_data.name {
                    group.name = group_data.name.clone();
                    group.save(&conn).await?;
                }
                group.uuid
            } else {
                let mut group =
@@ -172,8 +180,14 @@ async fn ldap_import(data: Json<OrgImportData>, token: PublicToken, conn: DbConn
        for member in Membership::find_by_org(&org_id, &conn).await {
            if let Some(ref user_external_id) = member.external_id
                && !sync_members.contains(user_external_id)
                && member.atype != MembershipType::Owner
            {
                if member.atype == MembershipType::Owner && member.status == MembershipStatus::Confirmed as i32 {
                    // Removing owner, check that there is at least one other confirmed owner
                    if Membership::count_confirmed_by_org_and_type(&org_id, MembershipType::Owner, &conn).await <= 1 {
                        warn!("Can't delete the last owner");
                        continue;
                    }
                }
                member.delete(&conn).await?;
            }
        }
@@ -12,7 +12,7 @@ use serde_json::Value;
 use crate::{
    CONFIG,
    api::{ApiResult, EmptyResult, JsonResult, Notify, UpdateType},
-    auth::{Headers, Host, SendHeaders},
+    auth::{ClientIp, Headers, Host, SendHeaders},
    config::PathType,
    db::{
        DbConn, DbPool,
@@ -23,7 +23,7 @@ use crate::{
 const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer available";
 static ANON_PUSH_DEVICE: LazyLock<Device> = LazyLock::new(|| {
-    let dt = DateTime::UNIX_EPOCH.naive_utc();
+    let dt = crate::util::parse_date("1970-01-01T00:00:00.000000Z");
    Device {
        uuid: String::from("00000000-0000-0000-0000-000000000000").into(),
        created_at: dt,
@@ -39,15 +39,18 @@ static ANON_PUSH_DEVICE: LazyLock<Device> = LazyLock::new(|| {
 });
 // The max file size allowed by Bitwarden clients and add an extra 5% to avoid issues
-pub(crate) const SIZE_525_MB: i64 = 550_502_400;
+const SIZE_525_MB: i64 = 550_502_400;
 pub fn routes() -> Vec<rocket::Route> {
    routes![
        get_sends,
        get_send,
        post_send,
        post_send_file,
        post_access,
        post_access_legacy,
        post_access_file,
        post_access_file_legacy,
        put_send,
        delete_send,
        put_remove_password,
@@ -70,7 +73,7 @@ pub async fn purge_sends(pool: DbPool) {
 #[serde(rename_all = "camelCase")]
 pub struct SendData {
    r#type: i32,
-    pub key: String,
+    key: String,
    password: Option<String>,
    max_access_count: Option<NumberOrString>,
    expiration_date: Option<DateTime<Utc>>,
@@ -198,7 +201,7 @@ async fn post_send(data: Json<SendData>, headers: Headers, conn: DbConn, nt: Not
    enforce_disable_hide_email_policy(&data, &headers, &conn).await?;
    if data.r#type == SendType::File as i32 {
-        err!("File sends should use /api/sends/file/v2")
+        err!("File sends should use /api/sends/file")
    }
    let mut send = create_send(data, headers.user.uuid)?;
@@ -215,11 +218,93 @@ async fn post_send(data: Json<SendData>, headers: Headers, conn: DbConn, nt: Not
    Ok(Json(send.to_json()))
 }
 #[derive(FromForm)]
 struct UploadData<'f> {
    model: Json<SendData>,
    data: TempFile<'f>,
 }
 #[derive(FromForm)]
 struct UploadDataV2<'f> {
    data: TempFile<'f>,
 }
 // @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads (v2).
 // This method still exists to support older clients, probably need to remove it sometime.
 // Upstream: https://github.com/bitwarden/server/blob/d0c793c95181dfb1b447eb450f85ba0bfd7ef643/src/Api/Controllers/SendsController.cs#L164-L167
 // 2025: This endpoint doesn't seem to exists anymore in the latest version
 // See: https://github.com/bitwarden/server/blob/9ebe16587175b1c0e9208f84397bb75d0d595510/src/Api/Tools/Controllers/SendsController.cs
 #[post("/sends/file", format = "multipart/form-data", data = "<data>")]
 async fn post_send_file(data: Form<UploadData<'_>>, headers: Headers, conn: DbConn, nt: Notify<'_>) -> JsonResult {
    enforce_disable_send_policy(&headers, &conn).await?;
    let UploadData {
        model,
        data,
    } = data.into_inner();
    let model = model.into_inner();
    let Some(size) = data.len().to_i64() else {
        err!("Invalid send size");
    };
    if size < 0 {
        err!("Send size can't be negative")
    }
    enforce_disable_hide_email_policy(&model, &headers, &conn).await?;
    let size_limit = match CONFIG.user_send_limit() {
        Some(0) => err!("File uploads are disabled"),
        Some(limit_kb) => {
            let Some(already_used) = Send::size_by_user(&headers.user.uuid, &conn).await else {
                err!("Existing sends overflow")
            };
            let Some(left) = limit_kb.checked_mul(1024).and_then(|l| l.checked_sub(already_used)) else {
                err!("Send size overflow");
            };
            if left <= 0 {
                err!("Send storage limit reached! Delete some sends to free up space")
            }
            i64::clamp(left, 0, SIZE_525_MB)
        }
        None => SIZE_525_MB,
    };
    if size > size_limit {
        err!("Send storage limit exceeded with this file");
    }
    let mut send = create_send(model, headers.user.uuid)?;
    if send.atype != SendType::File as i32 {
        err!("Send content is not a file");
    }
    let file_id = crate::crypto::generate_send_file_id();
    save_temp_file(&PathType::Sends, &format!("{}/{file_id}", send.uuid), data, true).await?;
    let mut data_value: Value = serde_json::from_str(&send.data)?;
    if let Some(o) = data_value.as_object_mut() {
        o.insert(String::from("id"), Value::String(file_id));
        o.insert(String::from("size"), Value::Number(size.into()));
        o.insert(String::from("sizeName"), Value::String(crate::util::get_display_size(size)));
    }
    send.data = serde_json::to_string(&data_value)?;
    // Save the changes in the database
    send.save(&conn).await?;
    nt.send_send_update(
        UpdateType::SyncSendCreate,
        &send,
        &send.update_users_revision(&conn).await,
        &headers.device,
        &conn,
    )
    .await;
    Ok(Json(send.to_json()))
 }
 // Upstream: https://github.com/bitwarden/server/blob/9ebe16587175b1c0e9208f84397bb75d0d595510/src/Api/Tools/Controllers/SendsController.cs#L165
 #[post("/sends/file/v2", data = "<data>")]
 async fn post_send_file_v2(data: Json<SendData>, headers: Headers, conn: DbConn) -> JsonResult {
@@ -328,8 +413,8 @@ async fn post_send_file_v2_data(
            "Send file name does not match.",
            format!(
                "Expected file name '{}' got '{}'",
-                send_data.fileName.escape_debug(),
+                send_data.fileName,
-                raw_file_name.dangerous_unsafe_unsanitized_raw().as_str().escape_debug()
+                raw_file_name.dangerous_unsafe_unsanitized_raw()
            )
        ),
        _ => err!("Send file name does not match or is not provided."),
@@ -365,16 +450,70 @@ async fn post_send_file_v2_data(
 #[post("/sends/access")]
 async fn post_access(headers: SendHeaders, conn: DbConn, nt: Notify<'_>) -> JsonResult {
-    let Some(mut send) = Send::find_by_uuid(&headers.send_id, &conn).await else {
+    let Some(send) = Send::find_by_uuid(&headers.send_id, &conn).await else {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    };
-    if !send.is_accessible() {
+    process_access(send, conn, nt).await
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SendAccessData {
    pub password: Option<String>,
 }
 // Legacy since web-2026.6.0
 #[post("/sends/access/<access_id>", data = "<data>")]
 async fn post_access_legacy(
    access_id: &str,
    data: Json<SendAccessData>,
    conn: DbConn,
    ip: ClientIp,
    nt: Notify<'_>,
 ) -> JsonResult {
    crate::ratelimit::check_limit_unauthenticated(&ip.ip)?;
    let Some(mut send) = Send::find_by_access_id(access_id, &conn).await else {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    };
    if let Some(max_access_count) = send.max_access_count
        && send.access_count >= max_access_count
    {
        err_code!(SEND_INACCESSIBLE_MSG, 404);
    }
    if let Some(expiration) = send.expiration_date
        && Utc::now().naive_utc() >= expiration
    {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if Utc::now().naive_utc() >= send.deletion_date {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if send.disabled {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if send.password_hash.is_some() {
        match data.into_inner().password {
            Some(ref p) if send.check_password(p) => { /* Nothing to do here */ }
            Some(_) => err!("Invalid password", format!("IP: {}.", ip.ip)),
            None => err_code!("Password not provided", format!("IP: {}.", ip.ip), 401),
        }
    }
    // Files are incremented during the download
-    if send.atype == SendType::Text as i32 && !send.register_access(&conn).await? {
+    if send.atype == SendType::Text as i32 {
-        err_code!(SEND_INACCESSIBLE_MSG, 404)
+        if !send.register_access(&conn).await? {
            err_code!(SEND_INACCESSIBLE_MSG, 404)
        }
    } else {
        send.save(&conn).await?;
    }
    process_access(send, conn, nt).await
 }
@@ -399,27 +538,62 @@ async fn post_access_file(
    conn: DbConn,
    nt: Notify<'_>,
 ) -> JsonResult {
-    let Some(mut send) = Send::find_by_uuid(&headers.send_id, &conn).await else {
+    let Some(send) = Send::find_by_uuid(&headers.send_id, &conn).await else {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    };
    if !send.is_accessible() {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    check_send_file_id(&send, &file_id)?;
    if !send.register_access(&conn).await? {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    process_access_file(send, file_id, host, conn, nt).await
 }
-fn check_send_file_id(send: &Send, file_id: &SendFileId) -> EmptyResult {
+// Legacy since web-2026.6.0
-    if send.atype != SendType::File as i32 {
+#[post("/sends/<send_id>/access/file/<file_id>", data = "<data>")]
-        err!("Send is not a file type send.");
+async fn post_access_file_legacy(
    send_id: SendId,
    file_id: SendFileId,
    data: Json<SendAccessData>,
    host: Host,
    conn: DbConn,
    ip: ClientIp,
    nt: Notify<'_>,
 ) -> JsonResult {
    crate::ratelimit::check_limit_unauthenticated(&ip.ip)?;
    let Some(mut send) = Send::find_by_uuid(&send_id, &conn).await else {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    };
    if let Some(max_access_count) = send.max_access_count
        && send.access_count >= max_access_count
    {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
-    match serde_json::from_str::<SendFileData>(&send.data) {
+
-        Ok(data) if &data.id == file_id => Ok(()),
+    if let Some(expiration) = send.expiration_date
-        _ => err_code!(SEND_INACCESSIBLE_MSG, 404),
+        && Utc::now().naive_utc() >= expiration
    {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if Utc::now().naive_utc() >= send.deletion_date {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if send.disabled {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    if send.password_hash.is_some() {
        match data.into_inner().password {
            Some(ref p) if send.check_password(p) => { /* Nothing to do here */ }
            Some(_) => err!("Invalid password."),
            None => err_code!("Password not provided", 401),
        }
    }
    if !send.register_access(&conn).await? {
        err_code!(SEND_INACCESSIBLE_MSG, 404)
    }
    process_access_file(send, file_id, host, conn, nt).await
 }
 async fn process_access_file(send: Send, file_id: SendFileId, host: Host, conn: DbConn, nt: Notify<'_>) -> JsonResult {
@@ -482,7 +656,7 @@ async fn put_send(send_id: SendId, data: Json<SendData>, headers: Headers, conn:
    Ok(Json(send.to_json()))
 }
-async fn update_send_from_data(
+pub async fn update_send_from_data(
    send: &mut Send,
    data: SendData,
    headers: &Headers,
@@ -3,7 +3,7 @@ use rocket::{Route, serde::json::Json};
 use crate::{
    api::{EmptyResult, JsonResult, PasswordOrOtpData, core::log_user_event, core::two_factor::generate_recover_code},
-    auth::{ClientIp, Headers, two_factor},
+    auth::{ClientIp, Headers},
    crypto,
    db::{
        DbConn,
@@ -20,23 +20,27 @@ pub fn routes() -> Vec<Route> {
 #[post("/two-factor/get-authenticator", data = "<data>")]
 async fn generate_authenticator(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn) -> JsonResult {
    let data: PasswordOrOtpData = data.into_inner();
    let user = headers.user;
    data.validate(&user, false, &conn).await?;
-    let twofactor = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Authenticator, &conn).await;
+    let type_ = TwoFactorType::Authenticator as i32;
    let twofactor = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await;
    let (enabled, key) = match twofactor {
        Some(tf) => (true, tf.data),
        _ => (false, crypto::encode_random_bytes::<20>(&BASE32)),
    };
    // Upstream seems to also return `userVerificationToken`, but doesn't seem to be used at all.
    // It should help prevent TOTP disclosure if someone keeps their vault unlocked.
    // Since it doesn't seem to be used, and also does not cause any issues, lets leave it out of the response.
    // See: https://github.com/bitwarden/server/blob/9ebe16587175b1c0e9208f84397bb75d0d595510/src/Api/Auth/Controllers/TwoFactorController.cs#L94
    Ok(Json(json!({
-        "authenticator": json!({
+        "enabled": enabled,
-            "enabled": enabled,
+        "key": key,
-            "key": key,
+        "object": "twoFactorAuthenticator"
        }),
        "userVerificationToken": two_factor::authenticator_token(user.uuid, key, enabled),
    })))
 }
@@ -45,7 +49,8 @@ async fn generate_authenticator(data: Json<PasswordOrOtpData>, headers: Headers,
 struct EnableAuthenticatorData {
    key: String,
    token: NumberOrString,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 #[post("/two-factor/authenticator", data = "<data>")]
@@ -56,7 +61,12 @@ async fn activate_authenticator(data: Json<EnableAuthenticatorData>, headers: He
    let mut user = headers.user;
-    two_factor::validate_authenticator(&data.user_verification_token, &user.uuid, &key, false)?;
+    PasswordOrOtpData {
        master_password_hash: data.master_password_hash,
        otp: data.otp,
    }
    .validate(&user, true, &conn)
    .await?;
    // Validate key as base32 and 20 bytes length
    let decoded_key: Vec<u8> = if let Ok(decoded) = BASE32.decode(key.as_bytes()) {
@@ -74,13 +84,12 @@ async fn activate_authenticator(data: Json<EnableAuthenticatorData>, headers: He
    generate_recover_code(&mut user, &conn).await;
-    log_user_event(EventType::UserUpdated2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+    log_user_event(EventType::UserUpdated2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    Ok(Json(json!({
-        "authenticator": json!({
+        "enabled": true,
-            "enabled": true,
+        "key": key,
-            "key": key,
+        "object": "twoFactorAuthenticator"
        }),
    })))
 }
@@ -116,7 +125,8 @@ pub async fn validate_totp_code(
        err!("Invalid TOTP secret")
    };
-    let mut twofactor = match TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Authenticator, conn).await {
+    let mut twofactor = match TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Authenticator as i32, conn).await
    {
        Some(tf) => tf,
        _ => TwoFactor::new(user_id.clone(), TwoFactorType::Authenticator, secret.to_owned()),
    };
@@ -174,25 +184,36 @@ pub async fn validate_totp_code(
 #[serde(rename_all = "camelCase")]
 struct DisableAuthenticatorData {
    key: String,
-    user_verification_token: String,
+    master_password_hash: String,
    r#type: NumberOrString,
 }
 #[delete("/two-factor/authenticator", data = "<data>")]
-async fn disable_authenticator(data: Json<DisableAuthenticatorData>, headers: Headers, conn: DbConn) -> EmptyResult {
+async fn disable_authenticator(data: Json<DisableAuthenticatorData>, headers: Headers, conn: DbConn) -> JsonResult {
    let user = headers.user;
    let type_ = data.r#type.into_i32()?;
-    two_factor::validate_authenticator(&data.user_verification_token, &user.uuid, &data.key, true)?;
+    if !user.check_valid_password(&data.master_password_hash) {
        err!("Invalid password");
    }
-    if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Authenticator, &conn).await {
+    if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await {
        if twofactor.data == data.key {
            twofactor.delete(&conn).await?;
-            log_user_event(EventType::UserDisabled2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+            log_user_event(EventType::UserDisabled2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn)
                .await;
        } else {
            err!(format!("TOTP key for user {} does not match recorded value, cannot deactivate", &user.email));
        }
    }
-    super::check_2fa_state(&user, headers.device.atype, &headers.ip.ip, &conn).await?;
+    if TwoFactor::find_by_user(&user.uuid, &conn).await.is_empty() {
        super::enforce_2fa_policy(&user, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await?;
    }
-    Ok(())
+    Ok(Json(json!({
        "enabled": false,
        "keys": type_,
        "object": "twoFactorProvider"
    })))
 }
@@ -1,13 +1,14 @@
 use chrono::Utc;
 use data_encoding::BASE64;
 use rocket::{Route, serde::json::Json};
 use crate::{
    CONFIG,
    api::{
-        ApiResult, EmptyResult, JsonResult, PasswordOrOtpData,
+        ApiResult, EmptyResult, JsonResult, PasswordOrOtpData, core::log_user_event,
-        core::log_user_event,
+        core::two_factor::generate_recover_code,
        core::two_factor::{VerificationTokenData, generate_recover_code},
    },
-    auth::{Headers, two_factor, two_factor::DuoData},
+    auth::Headers,
    crypto,
    db::{
        DbConn,
@@ -18,7 +19,55 @@ use crate::{
 };
 pub fn routes() -> Vec<Route> {
-    routes![get_duo, activate_duo, activate_duo_put, disable_duo,]
+    routes![get_duo, activate_duo, activate_duo_put,]
 }
 #[derive(Serialize, Deserialize)]
 struct DuoData {
    host: String, // Duo API hostname
    ik: String,   // client id
    sk: String,   // client secret
 }
 impl DuoData {
    fn global() -> Option<Self> {
        match (CONFIG._enable_duo(), CONFIG.duo_host()) {
            (true, Some(host)) => Some(Self {
                host,
                ik: CONFIG.duo_ikey().unwrap(),
                sk: CONFIG.duo_skey().unwrap(),
            }),
            _ => None,
        }
    }
    fn msg(s: &str) -> Self {
        Self {
            host: s.into(),
            ik: s.into(),
            sk: s.into(),
        }
    }
    fn secret() -> Self {
        Self::msg("<global_secret>")
    }
    fn obscure(self) -> Self {
        let mut host = self.host;
        let mut ik = self.ik;
        let mut sk = self.sk;
        let digits = 4;
        let replaced = "************";
        host.replace_range(digits.., replaced);
        ik.replace_range(digits.., replaced);
        sk.replace_range(digits.., replaced);
        Self {
            host,
            ik,
            sk,
        }
    }
 }
 enum DuoStatus {
@@ -47,19 +96,22 @@ async fn get_duo(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn)
    data.validate(&user, false, &conn).await?;
-    let (enabled, duo) = match get_user_duo_data(&user.uuid, &conn).await {
+    let data = get_user_duo_data(&user.uuid, &conn).await;
    let (enabled, data) = match data {
        DuoStatus::Global(_) => (true, Some(DuoData::secret())),
        DuoStatus::User(data) => (true, Some(data.obscure())),
        DuoStatus::Disabled(true) => (false, Some(DuoData::msg(DISABLED_MESSAGE_DEFAULT))),
        DuoStatus::Disabled(false) => (false, None),
    };
-    let duo_json = if let Some(data) = duo.as_ref() {
+    let json = if let Some(data) = data {
        json!({
            "enabled": enabled,
            "host": data.host,
            "clientSecret": data.sk,
            "clientId": data.ik,
            "object": "twoFactorDuo"
        })
    } else {
        json!({
@@ -67,13 +119,11 @@ async fn get_duo(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn)
            "host": null,
            "clientSecret": null,
            "clientId": null,
            "object": "twoFactorDuo"
        })
    };
-    Ok(Json(rocket::serde::json::json!({
+    Ok(Json(json))
        "duo": duo_json,
        "userVerificationToken": two_factor::duo_token(user.uuid, duo, enabled),
    })))
 }
 #[derive(Deserialize)]
@@ -82,7 +132,8 @@ struct EnableDuoData {
    host: String,
    client_secret: String,
    client_id: String,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 impl From<EnableDuoData> for DuoData {
@@ -109,7 +160,12 @@ async fn activate_duo(data: Json<EnableDuoData>, headers: Headers, conn: DbConn)
    let data: EnableDuoData = data.into_inner();
    let mut user = headers.user;
-    two_factor::validate_duo(&data.user_verification_token, &user.uuid, None, false)?;
+    PasswordOrOtpData {
        master_password_hash: data.master_password_hash.clone(),
        otp: data.otp.clone(),
    }
    .validate(&user, true, &conn)
    .await?;
    let (data, data_str) = if check_duo_fields_custom(&data) {
        let data_req: DuoData = data.into();
@@ -126,15 +182,14 @@ async fn activate_duo(data: Json<EnableDuoData>, headers: Headers, conn: DbConn)
    generate_recover_code(&mut user, &conn).await;
-    log_user_event(EventType::UserUpdated2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+    log_user_event(EventType::UserUpdated2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    Ok(Json(json!({
-        "duo": json!({
+        "enabled": true,
-            "enabled": true,
+        "host": data.host,
-            "host": data.host,
+        "clientSecret": data.sk,
-            "clientSecret": data.sk,
+        "clientId": data.ik,
-            "clientId": data.ik,
+        "object": "twoFactorDuo"
        }),
    })))
 }
@@ -143,29 +198,6 @@ async fn activate_duo_put(data: Json<EnableDuoData>, headers: Headers, conn: DbC
    activate_duo(data, headers, conn).await
 }
 #[delete("/two-factor/duo", data = "<data>")]
 async fn disable_duo(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
    let user = headers.user;
    if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Duo, &conn).await {
        // Apply the same transformation than in `get_duo` to check we are disabling the correct one
        let duo = match to_user_duo_data(&twofactor) {
            DuoStatus::Global(_) => Some(DuoData::secret()),
            DuoStatus::User(data) => Some(data.obscure()),
            DuoStatus::Disabled(_) => None,
        };
        two_factor::validate_duo(&data.user_verification_token, &user.uuid, duo.as_ref(), true)?;
        twofactor.delete(&conn).await?;
        log_user_event(EventType::UserDisabled2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    }
    super::check_2fa_state(&user, headers.device.atype, &headers.ip.ip, &conn).await?;
    Ok(())
 }
 async fn duo_api_request(method: &str, path: &str, params: &str, data: &DuoData) -> EmptyResult {
    use reqwest::{Method, header};
    use std::str::FromStr;
@@ -190,16 +222,21 @@ async fn duo_api_request(method: &str, path: &str, params: &str, data: &DuoData)
    Ok(())
 }
 const DUO_EXPIRE: i64 = 300;
 const APP_EXPIRE: i64 = 3600;
 const AUTH_PREFIX: &str = "AUTH";
 const DUO_PREFIX: &str = "TX";
 const APP_PREFIX: &str = "APP";
 async fn get_user_duo_data(user_id: &UserId, conn: &DbConn) -> DuoStatus {
    let type_ = TwoFactorType::Duo as i32;
    // If the user doesn't have an entry, disabled
-    let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Duo, conn).await else {
+    let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, type_, conn).await else {
        return DuoStatus::Disabled(DuoData::global().is_some());
    };
    to_user_duo_data(&twofactor)
 }
 fn to_user_duo_data(twofactor: &TwoFactor) -> DuoStatus {
    // If the user has the required values, we use those
    if let Ok(data) = serde_json::from_str(&twofactor.data) {
        return DuoStatus::User(data);
@@ -214,13 +251,118 @@ fn to_user_duo_data(twofactor: &TwoFactor) -> DuoStatus {
    DuoStatus::Disabled(false)
 }
-// let (ik, sk, host) = get_duo_keys_email();
+// let (ik, sk, ak, host) = get_duo_keys();
-pub(crate) async fn get_duo_keys_email(email: &str, conn: &DbConn) -> ApiResult<(String, String, String)> {
+pub(crate) async fn get_duo_keys_email(email: &str, conn: &DbConn) -> ApiResult<(String, String, String, String)> {
    let data = match User::find_by_mail(email, conn).await {
        Some(u) => get_user_duo_data(&u.uuid, conn).await.data(),
        _ => DuoData::global(),
    }
    .map_res("Can't fetch Duo Keys")?;
-    Ok((data.ik, data.sk, data.host))
+    Ok((data.ik, data.sk, CONFIG.get_duo_akey().await, data.host))
 }
 pub async fn generate_duo_signature(email: &str, conn: &DbConn) -> ApiResult<(String, String)> {
    let now = Utc::now().timestamp();
    let (ik, sk, ak, host) = get_duo_keys_email(email, conn).await?;
    let duo_sign = sign_duo_values(&sk, email, &ik, DUO_PREFIX, now + DUO_EXPIRE);
    let app_sign = sign_duo_values(&ak, email, &ik, APP_PREFIX, now + APP_EXPIRE);
    Ok((format!("{duo_sign}:{app_sign}"), host))
 }
 fn sign_duo_values(key: &str, email: &str, ikey: &str, prefix: &str, expire: i64) -> String {
    let val = format!("{email}|{ikey}|{expire}");
    let cookie = format!("{prefix}|{}", BASE64.encode(val.as_bytes()));
    format!("{cookie}|{}", crypto::hmac_sign(key, &cookie))
 }
 pub async fn validate_duo_login(email: &str, response: &str, conn: &DbConn) -> EmptyResult {
    let split: Vec<&str> = response.split(':').collect();
    if split.len() != 2 {
        err!(
            "Invalid response length",
            ErrorEvent {
                event: EventType::UserFailedLogIn2fa
            }
        );
    }
    let auth_sig = split[0];
    let app_sig = split[1];
    let now = Utc::now().timestamp();
    let (ik, sk, ak, _host) = get_duo_keys_email(email, conn).await?;
    let auth_user = parse_duo_values(&sk, auth_sig, &ik, AUTH_PREFIX, now)?;
    let app_user = parse_duo_values(&ak, app_sig, &ik, APP_PREFIX, now)?;
    if !crypto::ct_eq(&auth_user, app_user) || !crypto::ct_eq(&auth_user, email) {
        err!(
            "Error validating duo authentication",
            ErrorEvent {
                event: EventType::UserFailedLogIn2fa
            }
        )
    }
    Ok(())
 }
 fn parse_duo_values(key: &str, val: &str, ikey: &str, prefix: &str, time: i64) -> ApiResult<String> {
    let split: Vec<&str> = val.split('|').collect();
    if split.len() != 3 {
        err!("Invalid value length")
    }
    let u_prefix = split[0];
    let u_b64 = split[1];
    let u_sig = split[2];
    let sig = crypto::hmac_sign(key, &format!("{u_prefix}|{u_b64}"));
    if !crypto::ct_eq(crypto::hmac_sign(key, &sig), crypto::hmac_sign(key, u_sig)) {
        err!("Duo signatures don't match")
    }
    if u_prefix != prefix {
        err!("Prefixes don't match")
    }
    let Ok(cookie_vec) = BASE64.decode(u_b64.as_bytes()) else {
        err!("Invalid Duo cookie encoding")
    };
    let Ok(cookie) = String::from_utf8(cookie_vec) else {
        err!("Invalid Duo cookie encoding")
    };
    let cookie_split: Vec<&str> = cookie.split('|').collect();
    if cookie_split.len() != 3 {
        err!("Invalid cookie length")
    }
    let username = cookie_split[0];
    let u_ikey = cookie_split[1];
    let expire = cookie_split[2];
    if !crypto::ct_eq(ikey, u_ikey) {
        err!("Invalid ikey")
    }
    let expire: i64 = if let Ok(e) = expire.parse() {
        e
    } else {
        err!("Invalid expire time")
    };
    if time >= expire {
        err!("Expired authorization")
    }
    Ok(username.into())
 }
@@ -383,7 +383,7 @@ pub async fn get_duo_auth_url(
    device_identifier: &DeviceId,
    conn: &DbConn,
 ) -> Result<String, Error> {
-    let (ik, sk, host) = get_duo_keys_email(email, conn).await?;
+    let (ik, sk, _, host) = get_duo_keys_email(email, conn).await?;
    let callback_url = match make_callback_url(client_id) {
        Ok(url) => url,
@@ -435,7 +435,7 @@ pub async fn validate_duo_login(
    let code = split[0];
    let state = split[1];
-    let (ik, sk, host) = get_duo_keys_email(email, conn).await?;
+    let (ik, sk, _, host) = get_duo_keys_email(email, conn).await?;
    // Get the context by the state reported by the client. If we don't have one,
    // it means the context is either missing or expired.
@@ -5,26 +5,20 @@ use crate::{
    CONFIG,
    api::{
        EmptyResult, JsonResult, PasswordOrOtpData,
-        core::{
+        core::{log_user_event, two_factor::generate_recover_code},
            log_user_event,
            two_factor::{VerificationTokenData, generate_recover_code},
        },
    },
-    auth::{ClientHeaders, Headers, two_factor},
+    auth::{ClientHeaders, Headers},
    crypto,
    db::{
        DbConn,
-        models::{
+        models::{AuthRequest, AuthRequestId, DeviceId, EventType, TwoFactor, TwoFactorType, User, UserId},
            AuthRequest, AuthRequestId, DeviceId, EventType, TwoFactor, TwoFactorIncomplete, TwoFactorType, User,
            UserId,
        },
    },
    error::{Error, MapResult},
    mail,
 };
 pub fn routes() -> Vec<Route> {
-    routes![get_email, send_email_login, send_email, email, disable_email]
+    routes![get_email, send_email_login, send_email, email,]
 }
 #[derive(Deserialize)]
@@ -69,19 +63,13 @@ async fn send_email_login(data: Json<SendEmailLoginData>, client_headers: Client
    let user = if let Some(email) = email {
        let Some(user) = User::find_by_mail(email, &conn).await else {
-            err!(
+            err!("Username or password is incorrect. Try again.")
                "Username or password is incorrect. Try again",
                format!("IP: {}. Username: {}.", client_headers.ip.ip, email.escape_debug())
            )
        };
        if let Some(master_password_hash) = master_password_hash {
            // Check password
            if !user.check_valid_password(master_password_hash) {
-                err!(
+                err!("Username or password is incorrect. Try again.")
                    "Username or password is incorrect. Try again",
                    format!("IP: {}. Username: {}.", client_headers.ip.ip, email.escape_debug())
                )
            }
        } else if let Some(auth_request_id) = auth_request_id {
            let Some(auth_request) = AuthRequest::find_by_uuid(auth_request_id, &conn).await else {
@@ -97,20 +85,6 @@ async fn send_email_login(data: Json<SendEmailLoginData>, client_headers: Client
            {
                err!("AuthRequest doesn't exist", "Invalid device, IP or code")
            }
        } else if let Some(device_identifier) = &data.device_identifier {
            // iOS/Android SSO logins send the email and device id but no password hash,
            // so accept a device that has a pending 2FA login for this user
            if TwoFactorIncomplete::find_by_user_and_device(&user.uuid, device_identifier, &conn).await.is_none() {
                err!(
                    "Username or password is incorrect. Try again",
                    format!("IP: {}. Username: {}.", client_headers.ip.ip, email.escape_debug())
                )
            }
            debug!(
                "Email 2FA fallback: pending login. Username: {}. Device: {}.",
                user.email,
                device_identifier.to_string().escape_debug()
            );
        } else {
            err!("No password hash has been submitted.")
        }
@@ -122,10 +96,7 @@ async fn send_email_login(data: Json<SendEmailLoginData>, client_headers: Client
        };
        // SSO login only sends device id, so we get the user by the most recently used device
        let Some(user) = User::find_by_device_for_email2fa(device_identifier, &conn).await else {
-            err!(
+            err!("Username or password is incorrect. Try again.")
                "Username or password is incorrect. Try again",
                format!("IP: {}. Device: {}.", client_headers.ip.ip, device_identifier.to_string().escape_debug())
            )
        };
        user
@@ -136,8 +107,8 @@ async fn send_email_login(data: Json<SendEmailLoginData>, client_headers: Client
 /// Generate the token, save the data for later verification and send email to user
 pub async fn send_token(user_id: &UserId, conn: &DbConn) -> EmptyResult {
-    let mut twofactor =
+    let type_ = TwoFactorType::Email as i32;
-        TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Email, conn).await.map_res("Two factor not found")?;
+    let mut twofactor = TwoFactor::find_by_user_and_type(user_id, type_, conn).await.map_res("Two factor not found")?;
    let generated_token = crypto::generate_email_token(CONFIG.email_token_size());
@@ -160,19 +131,18 @@ async fn get_email(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn
    data.validate(&user, false, &conn).await?;
    let (enabled, mfa_email) =
-        if let Some(x) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email, &conn).await {
+        match TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email as i32, &conn).await {
-            let twofactor_data = EmailTokenData::from_json(&x.data)?;
+            Some(x) => {
-            (true, Some(twofactor_data.email))
+                let twofactor_data = EmailTokenData::from_json(&x.data)?;
-        } else {
+                (true, json!(twofactor_data.email))
-            (false, None)
+            }
            _ => (false, serde_json::value::Value::Null),
        };
-    Ok(Json(rocket::serde::json::json!({
+    Ok(Json(json!({
-        "email": rocket::serde::json::json!({
+        "email": mfa_email,
-            "enabled": enabled,
+        "enabled": enabled,
-            "email": mfa_email,
+        "object": "twoFactorEmail"
        }),
        "userVerificationToken": two_factor::email_token(user.uuid, mfa_email, enabled),
    })))
 }
@@ -181,36 +151,43 @@ async fn get_email(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn
 struct SendEmailData {
    /// Email where 2FA codes will be sent to, can be different than user email account.
    email: String,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 /// Send a verification email to the specified email address to check whether it exists/belongs to user.
 #[post("/two-factor/send-email", data = "<data>")]
-async fn send_email(data: Json<SendEmailData>, headers: Headers, conn: DbConn) -> JsonResult {
+async fn send_email(data: Json<SendEmailData>, headers: Headers, conn: DbConn) -> EmptyResult {
    let data: SendEmailData = data.into_inner();
    let user = headers.user;
-    two_factor::validate_email(&data.user_verification_token, &user.uuid, data.email.clone(), false)?;
+    PasswordOrOtpData {
        master_password_hash: data.master_password_hash,
        otp: data.otp,
    }
    .validate(&user, false, &conn)
    .await?;
    if !CONFIG._enable_email_2fa() {
        err!("Email 2FA is disabled")
    }
-    if let Some(tf) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email, &conn).await {
+    let type_ = TwoFactorType::Email as i32;
    if let Some(tf) = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await {
        tf.delete(&conn).await?;
    }
    let generated_token = crypto::generate_email_token(CONFIG.email_token_size());
-    let twofactor_data = EmailTokenData::new(data.email, Some(generated_token));
+    let twofactor_data = EmailTokenData::new(data.email, generated_token);
    // Uses EmailVerificationChallenge as type to show that it's not verified yet.
-    let twofactor =
+    let twofactor = TwoFactor::new(user.uuid, TwoFactorType::EmailVerificationChallenge, twofactor_data.to_json());
        TwoFactor::new(user.uuid.clone(), TwoFactorType::EmailVerificationChallenge, twofactor_data.to_json());
    twofactor.save(&conn).await?;
    mail::send_token(&twofactor_data.email, &twofactor_data.last_token.map_res("Token is empty")?).await?;
-    Ok(Json(json!({})))
+    Ok(())
 }
 #[derive(Deserialize, Serialize)]
@@ -218,7 +195,8 @@ async fn send_email(data: Json<SendEmailData>, headers: Headers, conn: DbConn) -
 struct EmailData {
    email: String,
    token: String,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 /// Verify email belongs to user and can be used for 2FA email codes.
@@ -227,11 +205,17 @@ async fn email(data: Json<EmailData>, headers: Headers, conn: DbConn) -> JsonRes
    let data: EmailData = data.into_inner();
    let mut user = headers.user;
-    two_factor::validate_email(&data.user_verification_token, &user.uuid, data.email, false)?;
+    // This is the last step in the verification process, delete the otp directly afterwards
    PasswordOrOtpData {
        master_password_hash: data.master_password_hash,
        otp: data.otp,
    }
    .validate(&user, true, &conn)
    .await?;
-    let mut twofactor = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::EmailVerificationChallenge, &conn)
+    let type_ = TwoFactorType::EmailVerificationChallenge as i32;
-        .await
+    let mut twofactor =
-        .map_res("Two factor not found")?;
+        TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await.map_res("Two factor not found")?;
    let mut email_data = EmailTokenData::from_json(&twofactor.data)?;
@@ -250,26 +234,13 @@ async fn email(data: Json<EmailData>, headers: Headers, conn: DbConn) -> JsonRes
    generate_recover_code(&mut user, &conn).await;
-    log_user_event(EventType::UserUpdated2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+    log_user_event(EventType::UserUpdated2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
-    Ok(Json(json!({})))
+    Ok(Json(json!({
-}
+        "email": email_data.email,
-
+        "enabled": "true",
-#[delete("/two-factor/email", data = "<data>")]
+        "object": "twoFactorEmail"
-async fn disable_email(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
+    })))
    let user = headers.user;
    if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email, &conn).await {
        let twofactor_data = EmailTokenData::from_json(&twofactor.data)?;
        two_factor::validate_email(&data.user_verification_token, &user.uuid, twofactor_data.email, true)?;
        twofactor.delete(&conn).await?;
        log_user_event(EventType::UserDisabled2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    }
    super::check_2fa_state(&user, headers.device.atype, &headers.ip.ip, &conn).await?;
    Ok(())
 }
 /// Validate the email code when used as TwoFactor token mechanism
@@ -281,8 +252,9 @@ pub async fn validate_email_code_str(
    conn: &DbConn,
 ) -> EmptyResult {
    let mut email_data = EmailTokenData::from_json(data)?;
-    let mut twofactor =
+    let mut twofactor = TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Email as i32, conn)
-        TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Email, conn).await.map_res("Two factor not found")?;
+        .await
        .map_res("Two factor not found")?;
    let Some(issued_token) = &email_data.last_token else {
        err!(
            format!("No token available! IP: {ip}"),
@@ -341,10 +313,10 @@ pub struct EmailTokenData {
 }
 impl EmailTokenData {
-    pub fn new(email: String, token: Option<String>) -> EmailTokenData {
+    pub fn new(email: String, token: String) -> EmailTokenData {
        EmailTokenData {
            email,
-            last_token: token,
+            last_token: Some(token),
            token_sent: Utc::now().timestamp(),
            attempts: 0,
        }
@@ -382,8 +354,7 @@ pub async fn activate_email_2fa(user: &User, conn: &DbConn) -> EmptyResult {
    if user.verified_at.is_none() {
        err!("Auto-enabling of email 2FA failed because the users email address has not been verified!");
    }
-    // The token is set when the first code is sent
+    let twofactor_data = EmailTokenData::new(user.email.clone(), String::new());
    let twofactor_data = EmailTokenData::new(user.email.clone(), None);
    let twofactor = TwoFactor::new(user.uuid.clone(), TwoFactorType::Email, twofactor_data.to_json());
    twofactor.save(conn).await
 }
@@ -7,17 +7,21 @@ use serde_json::Value;
 use crate::{
    CONFIG,
-    api::{EmptyResult, JsonResult, PasswordOrOtpData, core::log_event},
+    api::{
        EmptyResult, JsonResult, PasswordOrOtpData,
        core::{log_event, log_user_event},
    },
    auth::Headers,
    crypto,
    db::{
        DbConn, DbPool,
        models::{
-            Device, DeviceType, EventType, Membership, MembershipType, OrgPolicyType, Organization, OrganizationId,
+            DeviceType, EventType, Membership, MembershipType, OrgPolicyType, Organization, OrganizationId, TwoFactor,
-            TwoFactor, TwoFactorIncomplete, TwoFactorType, User, UserId,
+            TwoFactorIncomplete, TwoFactorType, User, UserId,
        },
    },
    mail,
    util::NumberOrString,
 };
 pub mod authenticator;
@@ -65,7 +69,13 @@ pub fn is_twofactor_provider_usable(provider_type: &TwoFactorType, provider_data
 }
 pub fn routes() -> Vec<Route> {
-    let mut routes = routes![get_twofactor, get_recover, get_device_verification_settings];
+    let mut routes = routes![
        get_twofactor,
        get_recover,
        disable_twofactor,
        disable_twofactor_put,
        get_device_verification_settings,
    ];
    routes.append(&mut authenticator::routes());
    routes.append(&mut duo::routes());
@@ -77,12 +87,6 @@ pub fn routes() -> Vec<Route> {
    routes
 }
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct VerificationTokenData {
    user_verification_token: String,
 }
 #[get("/two-factor")]
 async fn get_twofactor(headers: Headers, conn: DbConn) -> Json<Value> {
    let twofactors = TwoFactor::find_by_user(&headers.user.uuid, &conn).await;
@@ -122,14 +126,49 @@ async fn generate_recover_code(user: &mut User, conn: &DbConn) {
    }
 }
-/// Call after a 2FA provider, or one of its keys, was removed. No remembered device may keep skipping
+#[derive(Deserialize)]
-/// the providers that are left, and once every provider is gone the 2FA policy applies.
+#[serde(rename_all = "camelCase")]
-pub async fn check_2fa_state(user: &User, device_type: i32, ip: &std::net::IpAddr, conn: &DbConn) -> EmptyResult {
+struct DisableTwoFactorData {
-    Device::clear_twofactor_remember_by_user(&user.uuid, conn).await?;
+    master_password_hash: Option<String>,
-    if TwoFactor::find_by_user(&user.uuid, conn).await.is_empty() {
+    otp: Option<String>,
-        enforce_2fa_policy(user, &user.uuid, device_type, ip, conn).await?;
+    r#type: NumberOrString,
 }
 #[post("/two-factor/disable", data = "<data>")]
 async fn disable_twofactor(data: Json<DisableTwoFactorData>, headers: Headers, conn: DbConn) -> JsonResult {
    let data: DisableTwoFactorData = data.into_inner();
    let user = headers.user;
    // Delete directly after a valid token has been provided
    PasswordOrOtpData {
        master_password_hash: data.master_password_hash,
        otp: data.otp,
    }
-    Ok(())
+    .validate(&user, true, &conn)
    .await?;
    let type_ = data.r#type.into_i32()?;
    if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await {
        twofactor.delete(&conn).await?;
        log_user_event(EventType::UserDisabled2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn)
            .await;
    }
    if TwoFactor::find_by_user(&user.uuid, &conn).await.is_empty() {
        enforce_2fa_policy(&user, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await?;
    }
    Ok(Json(json!({
        "enabled": false,
        "type": type_,
        "object": "twoFactorProvider"
    })))
 }
 #[put("/two-factor/disable", data = "<data>")]
 async fn disable_twofactor_put(data: Json<DisableTwoFactorData>, headers: Headers, conn: DbConn) -> JsonResult {
    disable_twofactor(data, headers, conn).await
 }
 pub async fn enforce_2fa_policy(
@@ -151,7 +190,7 @@ pub async fn enforce_2fa_policy(
            member.save(conn).await?;
            log_event(
-                EventType::OrganizationUserRevoked,
+                EventType::OrganizationUserRevoked as i32,
                &member.uuid,
                &member.org_uuid,
                act_user_id,
@@ -185,8 +224,16 @@ pub async fn enforce_2fa_policy_for_org(
            member.revoke();
            member.save(conn).await?;
-            log_event(EventType::OrganizationUserRevoked, &member.uuid, org_id, act_user_id, device_type, ip, conn)
+            log_event(
-                .await;
+                EventType::OrganizationUserRevoked as i32,
                &member.uuid,
                org_id,
                act_user_id,
                device_type,
                ip,
                conn,
            )
            .await;
        }
    }
@@ -72,7 +72,8 @@ async fn request_otp(headers: Headers, conn: DbConn) -> EmptyResult {
    let user = headers.user;
    // Only one Protected Action per user is allowed to take place, delete the previous one
-    if let Some(pa) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::ProtectedActions, &conn).await {
+    if let Some(pa) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::ProtectedActions as i32, &conn).await
    {
        let pa_data = ProtectedActionData::from_json(&pa.data)?;
        let elapsed = pa_data.time_since_sent().num_seconds();
        let delay = 30;
@@ -124,7 +125,7 @@ pub async fn validate_protected_action_otp(
    delete_if_valid: bool,
    conn: &DbConn,
 ) -> EmptyResult {
-    let mut pa = TwoFactor::find_by_user_and_type(user_id, TwoFactorType::ProtectedActions, conn)
+    let mut pa = TwoFactor::find_by_user_and_type(user_id, TwoFactorType::ProtectedActions as i32, conn)
        .await
        .map_res("Protected action token not found, try sending the code again or restart the process")?;
    let mut pa_data = ProtectedActionData::from_json(&pa.data)?;
@@ -1,4 +1,4 @@
-use std::{collections::HashSet, str::FromStr, sync::LazyLock, time::Duration};
+use std::{str::FromStr, sync::LazyLock, time::Duration};
 use rocket::{Route, serde::json::Json};
 use serde_json::Value;
@@ -18,18 +18,16 @@ use crate::{
    CONFIG,
    api::{
        EmptyResult, JsonResult, PasswordOrOtpData,
-        core::{
+        core::{log_user_event, two_factor::generate_recover_code},
            log_user_event,
            two_factor::{VerificationTokenData, generate_recover_code},
        },
    },
-    auth::{Headers, two_factor},
+    auth::Headers,
    crypto::ct_eq,
    db::{
        DbConn,
        models::{EventType, TwoFactor, TwoFactorType, UserId},
    },
    error::Error,
    util::NumberOrString,
 };
 static WEBAUTHN: LazyLock<Webauthn> = LazyLock::new(|| {
@@ -47,14 +45,7 @@ static WEBAUTHN: LazyLock<Webauthn> = LazyLock::new(|| {
 });
 pub fn routes() -> Vec<Route> {
-    routes![
+    routes![get_webauthn, generate_webauthn_challenge, activate_webauthn, activate_webauthn_put, delete_webauthn,]
        get_webauthn,
        generate_webauthn_challenge,
        activate_webauthn,
        activate_webauthn_put,
        delete_webauthn,
        delete_webauthns
    ]
 }
 // Some old u2f structs still needed for migrating from u2f to WebAuthn
@@ -128,36 +119,34 @@ async fn get_webauthn(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbC
    data.validate(&user, false, &conn).await?;
    let (enabled, registrations) = get_webauthn_registrations(&user.uuid, &conn).await?;
    let keys: Vec<i32> = registrations.iter().map(|r| r.id).collect();
    let registrations_json: Vec<Value> = registrations.iter().map(WebauthnRegistration::to_json).collect();
    Ok(Json(json!({
-        "webAuthn": json!({
+        "enabled": enabled,
-            "enabled": enabled,
+        "keys": registrations_json,
-            "keys": registrations_json,
+        "object": "twoFactorWebAuthn"
        }),
        "userVerificationToken": two_factor::webauthn_token(user.uuid, keys, enabled),
    })))
 }
 #[post("/two-factor/get-webauthn-challenge", data = "<data>")]
-async fn generate_webauthn_challenge(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> JsonResult {
+async fn generate_webauthn_challenge(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn) -> JsonResult {
    let data: PasswordOrOtpData = data.into_inner();
    let user = headers.user;
-    let (enabled, registrations) = get_webauthn_registrations(&user.uuid, &conn).await?;
+    data.validate(&user, false, &conn).await?;
-    let keys: Vec<i32> = registrations.iter().map(|r| r.id).collect();
+
-    let creds = registrations
+    let registrations = get_webauthn_registrations(&user.uuid, &conn)
        .await?
        .1
        .into_iter()
        .map(|r| r.credential.cred_id().to_owned()) // We return the credentialIds to the clients to avoid double registering
        .collect();
    two_factor::validate_webauthn(&data.user_verification_token, &user.uuid, &keys, enabled)?;
    let (mut challenge, state) = WEBAUTHN.start_passkey_registration(
        Uuid::from_str(&user.uuid).expect("Failed to parse UUID"), // Should never fail
        &user.email,
        user.display_name(),
-        Some(creds),
+        Some(registrations),
    )?;
    let mut state = serde_json::to_value(&state)?;
@@ -177,19 +166,17 @@ async fn generate_webauthn_challenge(data: Json<VerificationTokenData>, headers:
    let mut challenge_value = serde_json::to_value(challenge.public_key)?;
    challenge_value["status"] = "ok".into();
    challenge_value["errorMessage"] = "".into();
-
+    Ok(Json(challenge_value))
    Ok(Json(json!({
        "options": challenge_value
    })))
 }
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct EnableWebauthnData {
-    id: i32,
+    id: NumberOrString, // 1..5
    name: String,
    device_response: RegisterPublicKeyCredentialCopy,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 #[derive(Debug, Deserialize)]
@@ -270,14 +257,16 @@ async fn activate_webauthn(data: Json<EnableWebauthnData>, headers: Headers, con
    let data: EnableWebauthnData = data.into_inner();
    let mut user = headers.user;
-    let mut registrations: Vec<_> = get_webauthn_registrations(&user.uuid, &conn).await?.1;
+    PasswordOrOtpData {
-    let keys: Vec<i32> = registrations.iter().map(|r| r.id).collect();
+        master_password_hash: data.master_password_hash,
-    two_factor::validate_webauthn(&data.user_verification_token, &user.uuid, &keys, !keys.is_empty())?;
+        otp: data.otp,
    }
    .validate(&user, true, &conn)
    .await?;
    // Retrieve and delete the saved challenge state
-    let state = if let Some(tf) =
+    let type_ = TwoFactorType::WebauthnRegisterChallenge as i32;
-        TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::WebauthnRegisterChallenge, &conn).await
+    let state = if let Some(tf) = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn).await {
    {
        let state: PasskeyRegistration = serde_json::from_str(&tf.data)?;
        tf.delete(&conn).await?;
        state
@@ -288,9 +277,10 @@ async fn activate_webauthn(data: Json<EnableWebauthnData>, headers: Headers, con
    // Verify the credentials with the saved state
    let credential = WEBAUTHN.finish_passkey_registration(&data.device_response.into(), &state)?;
    let mut registrations: Vec<_> = get_webauthn_registrations(&user.uuid, &conn).await?.1;
    // TODO: Check for repeated ID's
    registrations.push(WebauthnRegistration {
-        id: data.id,
+        id: data.id.into_i32()?,
        name: data.name,
        migrated: false,
@@ -303,13 +293,13 @@ async fn activate_webauthn(data: Json<EnableWebauthnData>, headers: Headers, con
        .await?;
    generate_recover_code(&mut user, &conn).await;
-    log_user_event(EventType::UserUpdated2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+    log_user_event(EventType::UserUpdated2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    let keys_json: Vec<Value> = registrations.iter().map(WebauthnRegistration::to_json).collect();
    Ok(Json(json!({
-        "webAuthn": json!({
+        "enabled": true,
-            "enabled": true,
+        "keys": keys_json,
-            "keys": registrations.iter().map(WebauthnRegistration::to_json).collect::<Vec<Value>>(),
+        "object": "twoFactorU2f"
        }),
    })))
 }
@@ -320,87 +310,57 @@ async fn activate_webauthn_put(data: Json<EnableWebauthnData>, headers: Headers,
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-struct DeleteWebauthnData {
+struct DeleteU2FData {
-    id: i32,
+    id: NumberOrString,
-    user_verification_token: String,
+    master_password_hash: String,
 }
 #[delete("/two-factor/webauthn", data = "<data>")]
-async fn delete_webauthn(data: Json<DeleteWebauthnData>, headers: Headers, conn: DbConn) -> JsonResult {
+async fn delete_webauthn(data: Json<DeleteU2FData>, headers: Headers, conn: DbConn) -> JsonResult {
-    inner_delete_webauthns(&data.user_verification_token, |key| key.id != data.id, headers, &conn).await
+    let id = data.id.into_i32()?;
-}
+    if !headers.user.check_valid_password(&data.master_password_hash) {
        err!("Invalid password");
    }
-#[delete("/two-factor/webauthn/all", data = "<data>")]
+    let Some(mut tf) =
-async fn delete_webauthns(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> JsonResult {
+        TwoFactor::find_by_user_and_type(&headers.user.uuid, TwoFactorType::Webauthn as i32, &conn).await
-    inner_delete_webauthns(&data.user_verification_token, |_| false, headers, &conn).await
+    else {
 }
 async fn inner_delete_webauthns(
    token: &str,
    retain: impl Fn(&WebauthnRegistration) -> bool,
    headers: Headers,
    conn: &DbConn,
 ) -> JsonResult {
    let user = headers.user;
    let Some(mut tf) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Webauthn, conn).await else {
        err!("Webauthn data not found!")
    };
-    let mut keys: Vec<WebauthnRegistration> = serde_json::from_str(&tf.data)?;
+    let mut data: Vec<WebauthnRegistration> = serde_json::from_str(&tf.data)?;
    let keys_id: Vec<i32> = keys.iter().map(|r| r.id).collect();
-    two_factor::validate_webauthn(token, &user.uuid, &keys_id, true)?;
+    let Some(item_pos) = data.iter().position(|r| r.id == id) else {
    let mut removed: HashSet<Vec<u8>> = HashSet::new();
    let mut migrated = false;
    keys.retain(|key| {
        let retained = retain(key);
        if !retained {
            removed.insert(key.credential.cred_id().to_vec());
            migrated = migrated || key.migrated;
        }
        retained
    });
    if removed.is_empty() {
        err!("Webauthn entry not found")
-    }
+    };
-    if keys.is_empty() {
+    let removed_item = data.remove(item_pos);
-        tf.delete(conn).await?;
+    tf.data = serde_json::to_string(&data)?;
-        log_user_event(EventType::UserDisabled2fa, &user.uuid, headers.device.atype, &headers.ip.ip, conn).await;
+    tf.save(&conn).await?;
-    } else {
+    drop(tf);
        tf.data = serde_json::to_string(&keys)?;
        tf.save(conn).await?;
        drop(tf);
    }
    // If entry is migrated from u2f, delete the u2f entry as well
-    if migrated && let Some(mut u2f) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::U2f, conn).await {
+    if let Some(mut u2f) = TwoFactor::find_by_user_and_type(&headers.user.uuid, TwoFactorType::U2f as i32, &conn).await
-        let Ok(mut data) = serde_json::from_str::<Vec<U2FRegistration>>(&u2f.data) else {
+    {
        let mut data: Vec<U2FRegistration> = if let Ok(d) = serde_json::from_str(&u2f.data) {
            d
        } else {
            err!("Error parsing U2F data")
        };
-        data.retain(|old| !removed.contains(&old.reg.key_handle));
+        data.retain(|r| r.reg.key_handle != removed_item.credential.cred_id().as_slice());
        let new_data_str = serde_json::to_string(&data)?;
-        if data.is_empty() {
+        u2f.data = new_data_str;
-            u2f.delete(conn).await?;
+        u2f.save(&conn).await?;
        } else {
            let new_data_str = serde_json::to_string(&data)?;
            u2f.data = new_data_str;
            u2f.save(conn).await?;
        }
    }
-    super::check_2fa_state(&user, headers.device.atype, &headers.ip.ip, conn).await?;
+    let keys_json: Vec<Value> = data.iter().map(WebauthnRegistration::to_json).collect();
    Ok(Json(json!({
-        "webAuthn": json!({
+        "enabled": true,
-            "enabled": !keys.is_empty(),
+        "keys": keys_json,
-            "keys": keys.iter().map(WebauthnRegistration::to_json).collect::<Vec<Value>>(),
+        "object": "twoFactorU2f"
        }),
    })))
 }
@@ -408,7 +368,8 @@ pub async fn get_webauthn_registrations(
    user_id: &UserId,
    conn: &DbConn,
 ) -> Result<(bool, Vec<WebauthnRegistration>), Error> {
-    match TwoFactor::find_by_user_and_type(user_id, TwoFactorType::Webauthn, conn).await {
+    let type_ = TwoFactorType::Webauthn as i32;
    match TwoFactor::find_by_user_and_type(user_id, type_, conn).await {
        Some(tf) => Ok((tf.enabled, serde_json::from_str(&tf.data)?)),
        None => Ok((false, Vec::new())), // If no data, return empty list
    }
@@ -455,9 +416,8 @@ pub async fn generate_webauthn_login(user_id: &UserId, conn: &DbConn) -> JsonRes
 }
 pub async fn validate_webauthn_login(user_id: &UserId, response: &str, conn: &DbConn) -> EmptyResult {
-    let mut state = if let Some(tf) =
+    let type_ = TwoFactorType::WebauthnLoginChallenge as i32;
-        TwoFactor::find_by_user_and_type(user_id, TwoFactorType::WebauthnLoginChallenge, conn).await
+    let mut state = if let Some(tf) = TwoFactor::find_by_user_and_type(user_id, type_, conn).await {
    {
        let state: PasskeyAuthentication = serde_json::from_str(&tf.data)?;
        tf.delete(conn).await?;
        state
@@ -1,57 +1,23 @@
 use rocket::{Route, serde::json::Json};
 use serde_json::Value;
-use yubico_ng::{
+use yubico::{config::Config, verify_async};
    Verifier, YubicoError,
    config::Config,
    transport::{AsyncTransport, Response},
 };
 use crate::{
    CONFIG,
    api::{
        EmptyResult, JsonResult, PasswordOrOtpData,
-        core::{
+        core::{log_user_event, two_factor::generate_recover_code},
            log_user_event,
            two_factor::{VerificationTokenData, generate_recover_code},
        },
    },
-    auth::{Headers, two_factor},
+    auth::Headers,
    db::{
        DbConn,
        models::{EventType, TwoFactor, TwoFactorType},
    },
    error::{Error, MapResult},
    http_client,
 };
 pub fn routes() -> Vec<Route> {
-    routes![generate_yubikey, activate_yubikey, activate_yubikey_put, delete_yubikeys,]
+    routes![generate_yubikey, activate_yubikey, activate_yubikey_put,]
 }
 struct HttpClientTransport {
    client: reqwest::Client,
 }
 impl HttpClientTransport {
    fn new() -> Result<Self, reqwest::Error> {
        http_client::get_reqwest_client_builder(false).redirect(reqwest::redirect::Policy::none()).build().map(
            |client| Self {
                client,
            },
        )
    }
 }
 impl AsyncTransport for HttpClientTransport {
    type Error = YubicoError;
    async fn yubico_get(&self, url: &str) -> Result<Response, Self::Error> {
        let response = self.client.get(url).send().await.map_err(YubicoError::transport)?;
        Ok(Response {
            status: response.status().as_u16(),
            body: response.text().await.map_err(YubicoError::transport)?,
        })
    }
 }
 #[derive(Debug, Deserialize)]
@@ -63,7 +29,8 @@ struct EnableYubikeyData {
    key4: Option<String>,
    key5: Option<String>,
    nfc: bool,
-    user_verification_token: String,
+    master_password_hash: Option<String>,
    otp: Option<String>,
 }
 #[derive(Deserialize, Serialize, Debug)]
@@ -77,7 +44,8 @@ pub struct YubikeyMetadata {
 fn parse_yubikeys(data: &EnableYubikeyData) -> Vec<String> {
    let data_keys = [&data.key1, &data.key2, &data.key3, &data.key4, &data.key5];
-    data_keys.into_iter().flatten().filter(|e| !e.is_empty()).cloned().collect()
+
    data_keys.into_iter().flatten().cloned().collect()
 }
 fn jsonify_yubikeys(yubikeys: Vec<String>) -> Value {
@@ -105,15 +73,13 @@ fn get_yubico_credentials() -> Result<(String, String), Error> {
 async fn verify_yubikey_otp(otp: String) -> EmptyResult {
    let (yubico_id, yubico_secret) = get_yubico_credentials()?;
-    let mut config = Config::default().set_client_id(yubico_id).set_key(yubico_secret)?;
+    let config = Config::default().set_client_id(yubico_id).set_key(yubico_secret);
-    if let Some(yubico_server) = CONFIG.yubico_server() {
+
-        config = config.set_api_host(yubico_server);
+    match CONFIG.yubico_server() {
        Some(server) => verify_async(otp, config.set_api_hosts(vec![server])).await,
        None => verify_async(otp, config).await,
    }
-
+    .map_res("Failed to verify OTP")
    let client = HttpClientTransport::new()?;
    let verifier = Verifier::with_client(config, client)?;
    verifier.verify(otp).await.map_res("Failed to verify OTP")
 }
 #[post("/two-factor/get-yubikey", data = "<data>")]
@@ -127,47 +93,56 @@ async fn generate_yubikey(data: Json<PasswordOrOtpData>, headers: Headers, conn:
    data.validate(&user, false, &conn).await?;
    let user_id = &user.uuid;
    let yubikey_type = TwoFactorType::YubiKey as i32;
-    let (enabled, keys, yubikey_json) =
+    let r = TwoFactor::find_by_user_and_type(user_id, yubikey_type, &conn).await;
-        if let Some(r) = TwoFactor::find_by_user_and_type(user_id, TwoFactorType::YubiKey, &conn).await {
+
-            let yubikey_metadata: YubikeyMetadata = serde_json::from_str(&r.data)?;
+    if let Some(r) = r {
-            let enabled = !yubikey_metadata.keys.is_empty();
+        let yubikey_metadata: YubikeyMetadata = serde_json::from_str(&r.data)?;
-            let mut result = jsonify_yubikeys(yubikey_metadata.keys.clone());
+
-            result["enabled"] = Value::Bool(enabled);
+        let mut result = jsonify_yubikeys(yubikey_metadata.keys);
-            result["nfc"] = Value::Bool(yubikey_metadata.nfc);
+
-            (enabled, yubikey_metadata.keys, result)
+        result["enabled"] = Value::Bool(true);
-        } else {
+        result["nfc"] = Value::Bool(yubikey_metadata.nfc);
-            (false, Vec::new(), json!({"enabled": false}))
+        result["object"] = Value::String("twoFactorU2f".to_owned());
-        };
+
-    Ok(Json(json!({
+        Ok(Json(result))
-        "yubiKey": yubikey_json,
+    } else {
-        "userVerificationToken": two_factor::yubikey_token(user.uuid, keys, enabled),
+        Ok(Json(json!({
-    })))
+            "enabled": false,
            "object": "twoFactorU2f",
        })))
    }
 }
 #[post("/two-factor/yubikey", data = "<data>")]
 async fn activate_yubikey(data: Json<EnableYubikeyData>, headers: Headers, conn: DbConn) -> JsonResult {
    let data: EnableYubikeyData = data.into_inner();
    let yubikeys = parse_yubikeys(&data);
    let mut user = headers.user;
-    if yubikeys.is_empty() {
+    PasswordOrOtpData {
-        // Return an error to prevent saving empty keys which would cause users not being able to login anymore.
+        master_password_hash: data.master_password_hash.clone(),
-        // To remove all keys users should click the `Deactivate all keys` button
+        otp: data.otp.clone(),
        err!("A key is required.");
    }
    .validate(&user, true, &conn)
    .await?;
    // Check if we already have some data
    let mut yubikey_data =
-        if let Some(yd) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::YubiKey, &conn).await {
+        match TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::YubiKey as i32, &conn).await {
-            let ym: YubikeyMetadata = serde_json::from_str(&yd.data)?;
+            Some(data) => data,
-            two_factor::validate_yubikey(&data.user_verification_token, &user.uuid, &ym.keys, !ym.keys.is_empty())?;
+            None => TwoFactor::new(user.uuid.clone(), TwoFactorType::YubiKey, String::new()),
            yd
        } else {
            two_factor::validate_yubikey(&data.user_verification_token, &user.uuid, &Vec::new(), false)?;
            TwoFactor::new(user.uuid.clone(), TwoFactorType::YubiKey, String::new())
        };
    let yubikeys = parse_yubikeys(&data);
    if yubikeys.is_empty() {
        return Ok(Json(json!({
            "enabled": false,
            "object": "twoFactorU2f",
        })));
    }
    // Ensure they are valid OTPs
    for yubikey in &yubikeys {
        if yubikey.is_empty() || yubikey.len() == 12 {
@@ -189,12 +164,15 @@ async fn activate_yubikey(data: Json<EnableYubikeyData>, headers: Headers, conn:
    generate_recover_code(&mut user, &conn).await;
-    log_user_event(EventType::UserUpdated2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
+    log_user_event(EventType::UserUpdated2fa as i32, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    let mut result = jsonify_yubikeys(yubikey_metadata.keys);
    result["enabled"] = Value::Bool(true);
    result["nfc"] = Value::Bool(yubikey_metadata.nfc);
-    Ok(Json(json!({"yubiKey": result})))
+    result["object"] = Value::String("twoFactorU2f".to_owned());
    Ok(Json(result))
 }
 #[put("/two-factor/yubikey", data = "<data>")]
@@ -202,32 +180,13 @@ async fn activate_yubikey_put(data: Json<EnableYubikeyData>, headers: Headers, c
    activate_yubikey(data, headers, conn).await
 }
 #[delete("/two-factor/yubikey", data = "<data>")]
 async fn delete_yubikeys(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
    let user = headers.user;
    if let Some(r) = TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::YubiKey, &conn).await {
        let yubikey_metadata: YubikeyMetadata = serde_json::from_str(&r.data)?;
        two_factor::validate_yubikey(&data.user_verification_token, &user.uuid, &yubikey_metadata.keys, true)?;
        r.delete(&conn).await?;
        log_user_event(EventType::UserDisabled2fa, &user.uuid, headers.device.atype, &headers.ip.ip, &conn).await;
    }
    super::check_2fa_state(&user, headers.device.atype, &headers.ip.ip, &conn).await?;
    Ok(())
 }
 pub async fn validate_yubikey_login(response: &str, twofactor_data: &str) -> EmptyResult {
    if response.len() != 44 {
        err!("Invalid Yubikey OTP length");
    }
    let yubikey_metadata: YubikeyMetadata = serde_json::from_str(twofactor_data).expect("Can't parse Yubikey Metadata");
-    let Some(response_id) = response.get(..12) else {
+    let response_id = &response[..12];
        err!("Invalid Yubikey OTP");
    };
    if !yubikey_metadata.keys.contains(&response_id.to_owned()) {
        err!("Given Yubikey is not registered");
@@ -85,7 +85,7 @@ static ICON_SIZE_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?x)(\d+
 #[get("/<host>/icon.png")]
 fn icon_external(host: &str) -> Cached<Option<Redirect>> {
    let Ok(host) = get_valid_host(host) else {
-        warn!("Invalid host: {}", host.escape_debug());
+        warn!("Invalid host: {host}");
        return Cached::ttl(None, CONFIG.icon_cache_negttl(), true);
    };
@@ -113,7 +113,7 @@ async fn icon_internal(host: &str) -> Cached<(ContentType, Vec<u8>)> {
    const FALLBACK_ICON: &[u8] = include_bytes!("../static/images/fallback-icon.png");
    let Ok(host) = get_valid_host(host) else {
-        warn!("Invalid host: {}", host.escape_debug());
+        warn!("Invalid host: {host}");
        return Cached::ttl(
            (ContentType::new("image", "png"), FALLBACK_ICON.to_vec()),
            CONFIG.icon_cache_negttl(),
@@ -3,7 +3,7 @@ use num_traits::FromPrimitive;
 use rocket::{
    Route,
    form::{Form, FromForm},
-    http::{Accept, Cookie, CookieJar, MediaType, SameSite},
+    http::{Cookie, CookieJar, SameSite},
    response::Redirect,
    serde::json::Json,
 };
@@ -17,14 +17,15 @@ use crate::{
            accounts::{PreloginData, RegisterData, kdf_upgrade, prelogin, register},
            log_user_event,
            two_factor::{
-                authenticator, duo_oidc, email, enforce_2fa_policy, is_twofactor_provider_usable, webauthn, yubikey,
+                authenticator, duo, duo_oidc, email, enforce_2fa_policy, is_twofactor_provider_usable, webauthn,
                yubikey,
            },
        },
-        identity_master_password_policy,
+        master_password_policy,
        push::register_push_device,
    },
    auth,
-    auth::{AuthMethod, ClientHeaders, ClientIp, Secure, generate_organization_api_key_login_claims},
+    auth::{AuthMethod, ClientHeaders, ClientIp, ClientVersion, Secure, generate_organization_api_key_login_claims},
    crypto,
    db::{
        DbConn,
@@ -45,6 +46,7 @@ pub fn routes() -> Vec<Route> {
        login,
        post_prelogin,
        prelogin_password,
        identity_register,
        register_verification_email,
        register_finish,
        prevalidate,
@@ -55,7 +57,12 @@ pub fn routes() -> Vec<Route> {
 }
 #[post("/connect/token", data = "<data>")]
-async fn login(data: Form<ConnectData>, client_header: ClientHeaders, conn: DbConn) -> JsonResult {
+async fn login(
    data: Form<ConnectData>,
    client_header: ClientHeaders,
    client_version: Option<ClientVersion>,
    conn: DbConn,
 ) -> JsonResult {
    let data: ConnectData = data.into_inner();
    let mut user_id: Option<UserId> = None;
@@ -76,13 +83,17 @@ async fn login(data: Form<ConnectData>, client_header: ClientHeaders, conn: DbCo
            check_is_some(data.device_name.as_ref(), "device_name cannot be blank")?;
            check_is_some(data.device_type.as_ref(), "device_type cannot be blank")?;
-            password_login(data, &mut user_id, &conn, &client_header.ip).await
+            password_login(data, &mut user_id, &conn, &client_header.ip, client_version.as_ref()).await
        }
        "client_credentials" => {
            check_is_some(data.client_id.as_ref(), "client_id cannot be blank")?;
            check_is_some(data.client_secret.as_ref(), "client_secret cannot be blank")?;
            check_is_some(data.scope.as_ref(), "scope cannot be blank")?;
            check_is_some(data.device_identifier.as_ref(), "device_identifier cannot be blank")?;
            check_is_some(data.device_name.as_ref(), "device_name cannot be blank")?;
            check_is_some(data.device_type.as_ref(), "device_type cannot be blank")?;
            api_key_login(data, &mut user_id, &conn, &client_header.ip).await
        }
        "authorization_code" if CONFIG.sso_enabled() => {
@@ -94,7 +105,7 @@ async fn login(data: Form<ConnectData>, client_header: ClientHeaders, conn: DbCo
            check_is_some(data.device_name.as_ref(), "device_name cannot be blank")?;
            check_is_some(data.device_type.as_ref(), "device_type cannot be blank")?;
-            sso_login(data, &mut user_id, &conn, &client_header.ip).await
+            sso_login(data, &mut user_id, &conn, &client_header.ip, client_version.as_ref()).await
        }
        "authorization_code" => err!("SSO sign-in is not available"),
        "send_access" => {
@@ -118,7 +129,7 @@ async fn login(data: Form<ConnectData>, client_header: ClientHeaders, conn: DbCo
        match &login_result {
            Ok(_) => {
                log_user_event(
-                    EventType::UserLoggedIn,
+                    EventType::UserLoggedIn as i32,
                    &user_id,
                    client_header.device_type,
                    &client_header.ip.ip,
@@ -128,7 +139,8 @@ async fn login(data: Form<ConnectData>, client_header: ClientHeaders, conn: DbCo
            }
            Err(e) => {
                if let Some(ev) = e.get_event() {
-                    log_user_event(ev.event, &user_id, client_header.device_type, &client_header.ip.ip, &conn).await;
+                    log_user_event(ev.event as i32, &user_id, client_header.device_type, &client_header.ip.ip, &conn)
                        .await;
                }
            }
        }
@@ -178,7 +190,13 @@ async fn refresh_login(data: ConnectData, conn: &DbConn, ip: &ClientIp) -> JsonR
 }
 // After exchanging the code we need to check first if 2FA is needed before continuing
-async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbConn, ip: &ClientIp) -> JsonResult {
+async fn sso_login(
    data: ConnectData,
    user_id: &mut Option<UserId>,
    conn: &DbConn,
    ip: &ClientIp,
    client_version: Option<&ClientVersion>,
 ) -> JsonResult {
    AuthMethod::Sso.check_scope(data.scope.as_ref())?;
    // Ratelimit the login
@@ -216,24 +234,6 @@ async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbCon
                    }
                )
            }
            Some((user, None))
                if user.private_key.is_none()
                    && !CONFIG.sso_signups_allowed()
                    && !CONFIG.is_email_domain_allowed(&user.email)
                    && !CONFIG.mail_enabled()
                    && Invitation::find_by_mail(&user.email, conn).await.is_none() =>
            {
                error!(
                    "Login failure ({}), no invitation with email ({}) was found",
                    user_infos.identifier, user.email
                );
                err_silent!(
                    "Missing invitation",
                    ErrorEvent {
                        event: EventType::UserFailedLogIn
                    }
                )
            }
            Some((user, None)) if user.private_key.is_some() && !CONFIG.sso_signups_match_email() => {
                error!(
                    "Login failure ({}), existing non SSO user ({}) with same email ({}) and association is disabled",
@@ -281,15 +281,7 @@ async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbCon
    // Will trigger 2FA flow if needed
    let (user, mut device, twofactor_token, sso_user) = match user_with_sso {
        None => {
-            if !CONFIG.is_sso_signup_allowed(&user_infos.email) {
+            if !CONFIG.is_email_domain_allowed(&user_infos.email) {
                if CONFIG.signups_domains_whitelist().is_empty() {
                    err!(
                        "Signups are disabled. You will need an invitation",
                        ErrorEvent {
                            event: EventType::UserFailedLogIn
                        }
                    );
                }
                err!(
                    "Email domain not allowed",
                    ErrorEvent {
@@ -326,7 +318,7 @@ async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbCon
        Some((user, _)) if !user.enabled => {
            err!(
                "This user has been disabled",
-                format!("IP: {}. Username: {}.", ip.ip, user.email),
+                format!("IP: {}. Username: {}.", ip.ip, user.display_name()),
                ErrorEvent {
                    event: EventType::UserFailedLogIn
                }
@@ -335,7 +327,7 @@ async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbCon
        Some((mut user, sso_user)) => {
            let mut device = get_device(&data, conn, &user).await?;
-            let twofactor_token = twofactor_auth(&mut user, &data, &mut device, ip, conn).await?;
+            let twofactor_token = twofactor_auth(&mut user, &data, &mut device, ip, client_version, conn).await?;
            if user.private_key.is_none() {
                // User was invited a stub was created
@@ -367,7 +359,13 @@ async fn sso_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbCon
    authenticated_response(&user, &mut device, auth_tokens, twofactor_token, conn, ip).await
 }
-async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &DbConn, ip: &ClientIp) -> JsonResult {
+async fn password_login(
    data: ConnectData,
    user_id: &mut Option<UserId>,
    conn: &DbConn,
    ip: &ClientIp,
    client_version: Option<&ClientVersion>,
 ) -> JsonResult {
    // Validate scope
    AuthMethod::Password.check_scope(data.scope.as_ref())?;
@@ -376,14 +374,24 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
    // Get the user
    let username = data.username.as_ref().unwrap().trim();
    let log_username = username.escape_debug();
    let Some(mut user) = User::find_by_mail(username, conn).await else {
-        err!("Username or password is incorrect. Try again", format!("IP: {}. Username: {log_username}.", ip.ip))
+        err!("Username or password is incorrect. Try again", format!("IP: {}. Username: {username}.", ip.ip))
    };
    // Set the user_id here to be passed back used for event logging.
    *user_id = Some(user.uuid.clone());
    // Check if the user is disabled
    if !user.enabled {
        err!(
            "This user has been disabled",
            format!("IP: {}. Username: {username}.", ip.ip),
            ErrorEvent {
                event: EventType::UserFailedLogIn
            }
        )
    }
    let password = data.password.as_ref().unwrap();
    // If we get an auth request, we don't check the user's password, but the access code of the auth request
@@ -391,7 +399,7 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
        let Some(auth_request) = AuthRequest::find_by_uuid_and_user(auth_request_id, &user.uuid, conn).await else {
            err!(
                "Auth request not found. Try again.",
-                format!("IP: {}. Username: {log_username}.", ip.ip),
+                format!("IP: {}. Username: {username}.", ip.ip),
                ErrorEvent {
                    event: EventType::UserFailedLogIn,
                }
@@ -403,14 +411,13 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
        if auth_request.user_uuid != user.uuid
            || !auth_request.approved.unwrap_or(false)
            || auth_request.authentication_date.is_some()
            || request_expired
            || ip.ip.to_string() != auth_request.request_ip
            || !auth_request.check_access_code(password)
        {
            err!(
                "Username or access code is incorrect. Try again",
-                format!("IP: {}. Username: {log_username}.", ip.ip),
+                format!("IP: {}. Username: {username}.", ip.ip),
                ErrorEvent {
                    event: EventType::UserFailedLogIn,
                }
@@ -419,24 +426,13 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
    } else if !user.check_valid_password(password) {
        err!(
            "Username or password is incorrect. Try again",
-            format!("IP: {}. Username: {log_username}.", ip.ip),
+            format!("IP: {}. Username: {username}.", ip.ip),
            ErrorEvent {
                event: EventType::UserFailedLogIn,
            }
        )
    }
    // Check if the user is disabled
    if !user.enabled {
        err!(
            "This user has been disabled",
            format!("IP: {}. Username: {log_username}.", ip.ip),
            ErrorEvent {
                event: EventType::UserFailedLogIn
            }
        )
    }
    // Change the KDF Iterations (only when not logging in with an auth request)
    if data.auth_request.is_none() {
        kdf_upgrade(&mut user, password, conn).await?;
@@ -469,7 +465,7 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
        // We still want the login to fail until they actually verified the email address
        err!(
            "Please verify your email before trying again.",
-            format!("IP: {}. Username: {log_username}.", ip.ip),
+            format!("IP: {}. Username: {username}.", ip.ip),
            ErrorEvent {
                event: EventType::UserFailedLogIn
            }
@@ -478,20 +474,7 @@ async fn password_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &
    let mut device = get_device(&data, conn, &user).await?;
-    let twofactor_token = twofactor_auth(&mut user, &data, &mut device, ip, conn).await?;
+    let twofactor_token = twofactor_auth(&mut user, &data, &mut device, ip, client_version, conn).await?;
    // Like upstream, an auth request can be used for one login only. Marked after 2FA so a 2FA prompt doesn't use it up.
    if let Some(ref auth_request_id) = data.auth_request
        && !AuthRequest::set_authentication_date(auth_request_id, conn).await?
    {
        err!(
            "Username or access code is incorrect. Try again",
            format!("IP: {}. Username: {log_username}.", ip.ip),
            ErrorEvent {
                event: EventType::UserFailedLogIn,
            }
        )
    }
    let auth_tokens = auth::AuthTokens::new(&device, &user, AuthMethod::Password, data.client_id);
@@ -530,7 +513,7 @@ async fn authenticated_response(
    // Save to update `device.updated_at` to track usage and toggle new status
    device.save(true, conn).await?;
-    let master_password_policy = identity_master_password_policy(user, conn).await;
+    let master_password_policy = master_password_policy(user, conn).await;
    let has_master_password = !user.password_hash.is_empty();
    let master_password_unlock = if has_master_password {
@@ -551,7 +534,18 @@ async fn authenticated_response(
        Value::Null
    };
-    let account_keys = user.account_keys_json(conn).await;
+    let account_keys = if user.private_key.is_some() {
        json!({
            "publicKeyEncryptionKeyPair": {
                "wrappedPrivateKey": user.private_key,
                "publicKey": user.public_key,
                "Object": "publicKeyEncryptionKeyPair"
            },
            "Object": "privateKeys"
        })
    } else {
        Value::Null
    };
    let mut result = json!({
        "access_token": auth_tokens.access_token(),
@@ -563,6 +557,7 @@ async fn authenticated_response(
        "KdfIterations": user.client_kdf_iter,
        "KdfMemory": user.client_kdf_memory,
        "KdfParallelism": user.client_kdf_parallelism,
        "ResetMasterPassword": false, // TODO: Same as above
        "ForcePasswordReset": false,
        "MasterPasswordPolicy": master_password_policy,
        "scope": auth_tokens.scope(),
@@ -582,7 +577,7 @@ async fn authenticated_response(
        result["TwoFactorToken"] = Value::String(token);
    }
-    info!("User {} logged in successfully. IP: {}", user.email, ip.ip);
+    info!("User {} logged in successfully. IP: {}", user.display_name(), ip.ip);
    Ok(Json(result))
 }
@@ -592,14 +587,7 @@ async fn api_key_login(data: ConnectData, user_id: &mut Option<UserId>, conn: &D
    // Validate scope
    match data.scope.as_ref() {
-        Some(scope) if scope == &AuthMethod::UserApiKey.scope() => {
+        Some(scope) if scope == &AuthMethod::UserApiKey.scope() => user_api_key_login(data, user_id, conn, ip).await,
            // Like upstream, only the user API key logs in a device
            check_is_some(data.device_identifier.as_ref(), "device_identifier cannot be blank")?;
            check_is_some(data.device_name.as_ref(), "device_name cannot be blank")?;
            check_is_some(data.device_type.as_ref(), "device_type cannot be blank")?;
            user_api_key_login(data, user_id, conn, ip).await
        }
        Some(scope) if scope == &AuthMethod::OrgApiKey.scope() => organization_api_key_login(data, conn, ip).await,
        _ => err!("Scope not supported"),
    }
@@ -697,7 +685,18 @@ async fn user_api_key_login(
        Value::Null
    };
-    let account_keys = user.account_keys_json(conn).await;
+    let account_keys = if user.private_key.is_some() {
        json!({
            "publicKeyEncryptionKeyPair": {
                "wrappedPrivateKey": user.private_key,
                "publicKey": user.public_key,
                "Object": "publicKeyEncryptionKeyPair"
            },
            "Object": "privateKeys"
        })
    } else {
        Value::Null
    };
    // Note: No refresh_token is returned. The CLI just repeats the
    // client_credentials login flow when the existing token expires.
@@ -712,6 +711,7 @@ async fn user_api_key_login(
        "KdfIterations": user.client_kdf_iter,
        "KdfMemory": user.client_kdf_memory,
        "KdfParallelism": user.client_kdf_parallelism,
        "ResetMasterPassword": false, // TODO: according to official server seems something like: user.password_hash.is_empty(), but would need testing
        "ForcePasswordReset": false,
        "scope": AuthMethod::UserApiKey.scope(),
        "AccountKeys": account_keys,
@@ -777,6 +777,7 @@ async fn twofactor_auth(
    data: &ConnectData,
    device: &mut Device,
    ip: &ClientIp,
    client_version: Option<&ClientVersion>,
    conn: &DbConn,
 ) -> ApiResult<Option<String>> {
    let twofactors = TwoFactor::find_by_user(&user.uuid, conn).await;
@@ -805,12 +806,17 @@ async fn twofactor_auth(
    if ![TwoFactorType::Remember as i32, TwoFactorType::RecoveryCode as i32].contains(&selected_id)
        && !twofactor_ids.contains(&selected_id)
    {
-        err_json!(json_err_twofactor(&twofactor_ids, user, data, conn).await?, "Invalid two factor provider")
+        err_json!(
            json_err_twofactor(&twofactor_ids, &user.uuid, data, client_version, conn).await?,
            "Invalid two factor provider"
        )
    }
-    // Like upstream, a blank token counts as not provided
+    let Some(ref twofactor_code) = data.two_factor_token else {
-    let Some(twofactor_code) = data.two_factor_token.as_deref().filter(|t| !t.trim().is_empty()) else {
+        err_json!(
-        err_json!(json_err_twofactor(&twofactor_ids, user, data, conn).await?, "2FA token not provided")
+            json_err_twofactor(&twofactor_ids, &user.uuid, data, client_version, conn).await?,
            "2FA token not provided"
        )
    };
    let selected_twofactor = twofactors.into_iter().find(|tf| tf.atype == selected_id && tf.enabled);
@@ -824,14 +830,20 @@ async fn twofactor_auth(
        Some(TwoFactorType::Webauthn) => webauthn::validate_webauthn_login(&user.uuid, twofactor_code, conn).await?,
        Some(TwoFactorType::YubiKey) => yubikey::validate_yubikey_login(twofactor_code, &selected_data?).await?,
        Some(TwoFactorType::Duo) => {
-            duo_oidc::validate_duo_login(
+            if CONFIG.duo_use_iframe() {
-                &user.email,
+                // Legacy iframe prompt flow
-                twofactor_code,
+                duo::validate_duo_login(&user.email, twofactor_code, conn).await?;
-                data.client_id.as_ref().unwrap(),
+            } else {
-                data.device_identifier.as_ref().unwrap(),
+                // OIDC based flow
-                conn,
+                duo_oidc::validate_duo_login(
-            )
+                    &user.email,
-            .await?;
+                    twofactor_code,
                    data.client_id.as_ref().unwrap(),
                    data.device_identifier.as_ref().unwrap(),
                    conn,
                )
                .await?;
            }
        }
        Some(TwoFactorType::Email) => {
            email::validate_email_code_str(&user.uuid, twofactor_code, &selected_data?, &ip.ip, conn).await?;
@@ -853,42 +865,23 @@ async fn twofactor_auth(
                        device.save(true, conn).await?;
                    }
                    err_json!(
-                        json_err_twofactor(&twofactor_ids, user, data, conn).await?,
+                        json_err_twofactor(&twofactor_ids, &user.uuid, data, client_version, conn).await?,
                        "2FA Remember token not provided or expired"
                    )
                }
            }
        }
        Some(TwoFactorType::RecoveryCode) => {
-            // Like upstream, spaces and case don't matter
+            // Check if recovery code is correct
-            let recovery_code = twofactor_code.replace(' ', "").trim().to_lowercase();
+            if !user.check_valid_recovery_code(twofactor_code) {
-            if !user.check_valid_recovery_code(&recovery_code) {
+                err!("Recovery code is incorrect. Try again.")
                err!(
                    "Two-step token is invalid. Try again.",
                    ErrorEvent {
                        event: EventType::UserFailedLogIn2fa
                    }
                )
            }
            // Remove all twofactors from the user
            TwoFactor::delete_all_by_user(&user.uuid, conn).await?;
            // No device may keep skipping 2FA once every second factor is gone.
            // `device` is cleared in memory too, since saving it later would restore its token.
            Device::clear_twofactor_remember_by_user(&user.uuid, conn).await?;
            device.delete_twofactor_remember();
            enforce_2fa_policy(user, &user.uuid, device.atype, &ip.ip, conn).await?;
-            log_user_event(EventType::UserRecovered2fa, &user.uuid, device.atype, &ip.ip, conn).await;
+            log_user_event(EventType::UserRecovered2fa as i32, &user.uuid, device.atype, &ip.ip, conn).await;
            if CONFIG.mail_enabled()
                && let Err(e) =
                    mail::send_recover_twofactor(&user.email, &ip.ip.to_string(), &Utc::now().naive_utc()).await
            {
                error!("Error sending two-step login recovered email: {e:#?}");
            }
            // Remove the recovery code, not needed without twofactors
            user.totp_recover = None;
@@ -917,14 +910,21 @@ fn selected_data(tf: Option<TwoFactor>) -> ApiResult<String> {
    tf.map(|t| t.data).map_res("Two factor doesn't exist")
 }
-async fn json_err_twofactor(providers: &[i32], user: &User, data: &ConnectData, conn: &DbConn) -> ApiResult<Value> {
+async fn json_err_twofactor(
-    let user_id = &user.uuid;
+    providers: &[i32],
    user_id: &UserId,
    data: &ConnectData,
    client_version: Option<&ClientVersion>,
    conn: &DbConn,
 ) -> ApiResult<Value> {
    let mut result = json!({
        "error" : "invalid_grant",
        "error_description" : "Two factor required.",
        "TwoFactorProviders" : providers.iter().map(ToString::to_string).collect::<Vec<String>>(),
        "TwoFactorProviders2" : {}, // { "0" : null }
-        "MasterPasswordPolicy": identity_master_password_policy(user, conn).await,
+        "MasterPasswordPolicy": {
            "Object": "masterPasswordPolicy"
        }
    });
    for provider in providers {
@@ -937,21 +937,37 @@ async fn json_err_twofactor(providers: &[i32], user: &User, data: &ConnectData,
            }
            Some(TwoFactorType::Duo) => {
-                let auth_url = duo_oidc::get_duo_auth_url(
+                let email = if let Some(u) = User::find_by_uuid(user_id, conn).await {
-                    &user.email,
+                    u.email
-                    data.client_id.as_ref().unwrap(),
+                } else {
-                    data.device_identifier.as_ref().unwrap(),
+                    err!("User does not exist")
-                    conn,
+                };
                )
                .await?;
-                result["TwoFactorProviders2"][provider.to_string()] = json!({
+                if CONFIG.duo_use_iframe() {
-                    "AuthUrl": auth_url,
+                    // Legacy iframe prompt flow
-                });
+                    let (signature, host) = duo::generate_duo_signature(&email, conn).await?;
                    result["TwoFactorProviders2"][provider.to_string()] = json!({
                        "Host": host,
                        "Signature": signature,
                    });
                } else {
                    // OIDC based flow
                    let auth_url = duo_oidc::get_duo_auth_url(
                        &email,
                        data.client_id.as_ref().unwrap(),
                        data.device_identifier.as_ref().unwrap(),
                        conn,
                    )
                    .await?;
                    result["TwoFactorProviders2"][provider.to_string()] = json!({
                        "AuthUrl": auth_url,
                    });
                }
            }
            Some(tf_type @ TwoFactorType::YubiKey) => {
-                let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, tf_type, conn).await else {
+                let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, tf_type as i32, conn).await else {
                    err!("No YubiKey devices registered")
                };
@@ -963,10 +979,23 @@ async fn json_err_twofactor(providers: &[i32], user: &User, data: &ConnectData,
            }
            Some(tf_type @ TwoFactorType::Email) => {
-                let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, tf_type, conn).await else {
+                let Some(twofactor) = TwoFactor::find_by_user_and_type(user_id, tf_type as i32, conn).await else {
                    err!("No twofactor email registered")
                };
                // Starting with version 2025.5.0 the client will call `/api/two-factor/send-email-login`.
                let disabled_send = if let Some(cv) = client_version {
                    let ver_match = semver::VersionReq::parse(">=2025.5.0").unwrap();
                    ver_match.matches(&cv.0)
                } else {
                    false
                };
                // Send email immediately if email is the only 2FA option.
                if providers.len() == 1 && !disabled_send {
                    email::send_token(user_id, conn).await?;
                }
                let email_data = email::EmailTokenData::from_json(&twofactor.data)?;
                result["TwoFactorProviders2"][provider.to_string()] = json!({
                    "Email": email::obscure_email(&email_data.email),
@@ -995,13 +1024,18 @@ async fn json_err_twofactor(providers: &[i32], user: &User, data: &ConnectData,
 }
 #[post("/accounts/prelogin", data = "<data>")]
-async fn post_prelogin(data: Json<PreloginData>, ip: ClientIp, conn: DbConn) -> JsonResult {
+async fn post_prelogin(data: Json<PreloginData>, conn: DbConn) -> Json<Value> {
-    prelogin(data, ip, conn).await
+    prelogin(data, conn).await
 }
 #[post("/accounts/prelogin/password", data = "<data>")]
-async fn prelogin_password(data: Json<PreloginData>, ip: ClientIp, conn: DbConn) -> JsonResult {
+async fn prelogin_password(data: Json<PreloginData>, conn: DbConn) -> Json<Value> {
-    prelogin(data, ip, conn).await
+    prelogin(data, conn).await
 }
 #[post("/accounts/register", data = "<data>")]
 async fn identity_register(data: Json<RegisterData>, conn: DbConn) -> JsonResult {
    register(data, false, conn).await
 }
 #[derive(Debug, Deserialize)]
@@ -1017,18 +1051,11 @@ enum RegisterVerificationResponse {
    #[response(status = 204)]
    NoContent(()),
    Token(Json<String>),
    PlainToken(String),
 }
 // Return JSON only when the client explicitly requests it, otherwise return plain text.
 fn accepts_json(accept: Option<&Accept>) -> bool {
    accept.is_some_and(|accept| accept.preferred().media_type() == &MediaType::JSON)
 }
 #[post("/accounts/register/send-verification-email", data = "<data>")]
 async fn register_verification_email(
    data: Json<RegisterVerificationData>,
    accept: Option<&Accept>,
    ip: ClientIp,
    conn: DbConn,
 ) -> ApiResult<RegisterVerificationResponse> {
@@ -1066,18 +1093,13 @@ async fn register_verification_email(
    } else {
        // If email verification is not required, return the token directly
        // the clients will use this token to finish the registration
-        Ok(if accepts_json(accept) {
+        Ok(RegisterVerificationResponse::Token(Json(token)))
            RegisterVerificationResponse::Token(Json(token))
        } else {
            RegisterVerificationResponse::PlainToken(token)
        })
    }
 }
 #[post("/accounts/register/finish", data = "<data>")]
-async fn register_finish(data: Json<RegisterData>, ip: ClientIp, conn: DbConn) -> JsonResult {
+async fn register_finish(data: Json<RegisterData>, conn: DbConn) -> JsonResult {
-    crate::ratelimit::check_limit_unauthenticated(&ip.ip)?;
+    register(data, true, conn).await
    register(data, conn).await
 }
 // https://github.com/bitwarden/jslib/blob/master/common/src/models/request/tokenRequest.ts
@@ -1207,7 +1229,7 @@ async fn oidcsignin_redirect(
    let state = sso::decode_state(&base64_state)?;
    let Some(mut sso_auth) = SsoAuth::find(&state, conn).await else {
-        err!(format!("Cannot retrieve sso_auth for {}", state.escape_debug()))
+        err!(format!("Cannot retrieve sso_auth for {state}"))
    };
    // Browser-binding check
@@ -1216,7 +1238,7 @@ async fn oidcsignin_redirect(
    let provided_hash = cookie_value.as_deref().map(|v| crypto::sha256_hex(v.as_bytes()));
    match (sso_auth.binding_hash.as_deref(), provided_hash.as_deref()) {
        (Some(expected), Some(actual)) if crypto::ct_eq(expected, actual) => {}
-        _ => err!(format!("SSO session binding mismatch for {}", state.escape_debug())),
+        _ => err!(format!("SSO session binding mismatch for {state}")),
    }
    cookies
        .remove(Cookie::build(SSO_BINDING_COOKIE).path(format!("{}/identity/connect/", CONFIG.domain_path())).build());
@@ -30,7 +30,7 @@ pub use crate::api::{
    },
    web::catchers as web_catchers,
    web::routes as web_routes,
-    web::{invalidate_css_cache, static_files},
+    web::static_files,
 };
 use crate::{
    CONFIG,
@@ -46,7 +46,7 @@ pub type JsonResult = ApiResult<Json<Value>>;
 pub type EmptyResult = ApiResult<()>;
 // Common structs representing JSON data received
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct PasswordOrOtpData {
    #[serde(alias = "MasterPasswordHash")]
@@ -124,21 +124,3 @@ async fn master_password_policy(user: &User, conn: &DbConn) -> Value {
    mpp_json["Object"] = json!("masterPasswordPolicy");
    mpp_json
 }
 // Identity responses use PascalCase keys like upstream, some clients (Android) only read those
 async fn identity_master_password_policy(user: &User, conn: &DbConn) -> Value {
    match master_password_policy(user, conn).await {
        Value::Object(policy) => Value::Object(
            policy
                .into_iter()
                .map(|(mut key, value)| {
                    if let Some(first) = key.get_mut(..1) {
                        first.make_ascii_uppercase();
                    }
                    (key, value)
                })
                .collect(),
        ),
        policy => policy,
    }
 }
@@ -1,7 +1,7 @@
 use std::{
    net::IpAddr,
    sync::{Arc, LazyLock},
-    time::{Duration, Instant},
+    time::Duration,
 };
 use chrono::{NaiveDateTime, Utc};
@@ -41,14 +41,6 @@ pub static WS_ANONYMOUS_SUBSCRIPTIONS: LazyLock<Arc<AnonymousWebSocketSubscripti
 /// One connection is needed per pending login request, several at once are only expected behind NAT.
 const MAX_ANONYMOUS_CONNECTIONS_PER_IP: u32 = 25;
 /// How often a Ping is sent to the client.
 const WS_PING_INTERVAL: Duration = Duration::from_secs(15);
 /// Close the connection if nothing, not even a Pong, was received from the client for this long.
 /// Otherwise half-open connections (client gone without a FIN, e.g. behind a proxy or NAT) are kept forever.
 /// Same as the default `ClientTimeoutInterval` of ASP.NET Core SignalR, which the official server uses.
 const WS_CLIENT_TIMEOUT: Duration = Duration::from_secs(30);
 static NOTIFICATIONS_DISABLED: LazyLock<bool> = LazyLock::new(|| !CONFIG.enable_websocket() && !CONFIG.push_enabled());
 pub fn routes() -> Vec<Route> {
@@ -164,16 +156,12 @@ fn websockets_hub<'r>(
        rocket_ws::Stream! { ws => {
            let mut ws = ws;
            let _guard = guard;
-            let mut interval = tokio::time::interval(WS_PING_INTERVAL);
+            let mut interval = tokio::time::interval(Duration::from_secs(15));
            let mut last_received = Instant::now();
            loop {
                tokio::select! {
                    res = ws.next() =>  {
                        match res {
                            Some(Ok(message)) => {
                                // Any message, including a Pong, means the client is still there
                                last_received = Instant::now();
                                match message {
                                    // Respond to any pings
                                    Message::Ping(ping) => yield Message::Pong(ping),
@@ -207,13 +195,7 @@ fn websockets_hub<'r>(
                        }
                    }
-                    _ = interval.tick() => {
+                    _ = interval.tick() => yield Message::Ping(create_ping())
                        // The client stopped responding without closing the connection, drop it
                        if last_received.elapsed() > WS_CLIENT_TIMEOUT {
                            break;
                        }
                        yield Message::Ping(create_ping());
                    }
                }
            }
        }}
@@ -247,16 +229,12 @@ fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> R
        rocket_ws::Stream! { ws => {
            let mut ws = ws;
            let _guard = guard;
-            let mut interval = tokio::time::interval(WS_PING_INTERVAL);
+            let mut interval = tokio::time::interval(Duration::from_secs(15));
            let mut last_received = Instant::now();
            loop {
                tokio::select! {
                    res = ws.next() =>  {
                        match res {
                            Some(Ok(message)) => {
                                // Any message, including a Pong, means the client is still there
                                last_received = Instant::now();
                                match message {
                                    // Respond to any pings
                                    Message::Ping(ping) => yield Message::Pong(ping),
@@ -290,13 +268,7 @@ fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> R
                        }
                    }
-                    _ = interval.tick() => {
+                    _ = interval.tick() => yield Message::Ping(create_ping())
                        // The client stopped responding without closing the connection, drop it
                        if last_received.elapsed() > WS_CLIENT_TIMEOUT {
                            break;
                        }
                        yield Message::Ping(create_ping());
                    }
                }
            }
        }}
Author	SHA1	Message	Date
Daniel García	6a0c75320d	Fix org import	2026-07-24 16:36:11 +02:00
Daniel García	08dce4bcf9	Fmt	2026-07-24 16:32:50 +02:00
Daniel García	5f03e74feb	Fix get_groups_data when not using full_access	2026-07-24 16:20:34 +02:00
Daniel García	94a798e9dd	Fix get_groups_data	2026-07-24 15:47:51 +02:00
Daniel García	5a02e80a5a	Trusted proxies, unauthenticated rate limits and various fixes	2026-07-20 01:24:46 +02:00
		`@@ -1 +0,0 @@`
			`ALTER TABLE org_policies DROP COLUMN revision_date;`
		`@@ -1 +0,0 @@`
			`-- TEXT has no size limit here, only MySQL needed the change`