[PR #6153] [MERGED] a little cleanup after SSO merge #2461

New Issue

OVERLORD · 2025-10-09T18:05:34+03:00

OVERLORD commented

2025-10-09 18:05:34 +03:00

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/6153
Author: @stefan0xC
Created: 8/9/2025
Status: ✅ Merged
Merged: 8/9/2025
Merged by: @BlackDex

Base: main ← Head: cleanup-sso

📝 Commits (4)

d501350 fix some typos
dce8e37 rename scss variable to sso_enabled
8c7065a refactor is_mobile to device
6fda838 also mask sensitive sso config options

📊 Changes

16 files changed (+55 additions, -49 deletions)

View changed files

📝 .env.template (+1 -1)
📝 playwright/README.md (+22 -19)
📝 playwright/compose/warden/Dockerfile (+1 -1)
📝 playwright/test.env (+1 -1)
📝 src/api/core/accounts.rs (+3 -3)
📝 src/api/core/organizations.rs (+1 -1)
📝 src/api/icons.rs (+2 -2)
📝 src/api/identity.rs (+3 -3)
📝 src/api/web.rs (+1 -1)
📝 src/auth.rs (+1 -1)
📝 src/config.rs (+4 -1)
📝 src/db/models/device.rs (+4 -4)
📝 src/db/models/group.rs (+1 -1)
📝 src/sso.rs (+3 -3)
📝 src/sso_client.rs (+1 -1)
📝 src/static/templates/scss/vaultwarden.scss.hbs (+6 -6)

📄 Description

A few things I noticed while reviewing the changes (that were still pending). Mostly some typos in the comments and some function names. I've also moved the is_mobile() to the Device to be more like the is_cli() check and I think it would be better if the scss variable is called sso_enabled instead of sso_disabled because to me it's easier to reason about that way.

I'm also planning on working on the playwright setup (as discussed in #4369) and maybe some more refactoring of the code base now that it has been merged.

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

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/6153 **Author:** [@stefan0xC](https://github.com/stefan0xC) **Created:** 8/9/2025 **Status:** ✅ Merged **Merged:** 8/9/2025 **Merged by:** [@BlackDex](https://github.com/BlackDex) **Base:** `main` ← **Head:** `cleanup-sso` --- ### 📝 Commits (4) - [`d501350`](https://github.com/dani-garcia/vaultwarden/commit/d501350476e11d15de75dfc6d07225d717af6bec) fix some typos - [`dce8e37`](https://github.com/dani-garcia/vaultwarden/commit/dce8e37d736df2c992c9ec5d25cea8be3069938f) rename scss variable to sso_enabled - [`8c7065a`](https://github.com/dani-garcia/vaultwarden/commit/8c7065aa48ff7b5004f87b2d5921f5564b294cf4) refactor is_mobile to device - [`6fda838`](https://github.com/dani-garcia/vaultwarden/commit/6fda83891a2058e040f67a48863da8c487d77609) also mask sensitive sso config options ### 📊 Changes **16 files changed** (+55 additions, -49 deletions) <details> <summary>View changed files</summary> 📝 `.env.template` (+1 -1) 📝 `playwright/README.md` (+22 -19) 📝 `playwright/compose/warden/Dockerfile` (+1 -1) 📝 `playwright/test.env` (+1 -1) 📝 `src/api/core/accounts.rs` (+3 -3) 📝 `src/api/core/organizations.rs` (+1 -1) 📝 `src/api/icons.rs` (+2 -2) 📝 `src/api/identity.rs` (+3 -3) 📝 `src/api/web.rs` (+1 -1) 📝 `src/auth.rs` (+1 -1) 📝 `src/config.rs` (+4 -1) 📝 `src/db/models/device.rs` (+4 -4) 📝 `src/db/models/group.rs` (+1 -1) 📝 `src/sso.rs` (+3 -3) 📝 `src/sso_client.rs` (+1 -1) 📝 `src/static/templates/scss/vaultwarden.scss.hbs` (+6 -6) </details> ### 📄 Description A few things I noticed while reviewing the changes (that were still pending). Mostly some typos in the comments and some function names. I've also moved the `is_mobile()` to the `Device` to be more like the `is_cli()` check and I think it would be better if the scss variable is called `sso_enabled` instead of `sso_disabled` because to me it's easier to reason about that way. I'm also planning on working on the playwright setup (as discussed in #4369) and maybe some more refactoring of the code base now that it has been merged. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

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

OVERLORD closed this issue

2025-10-09 18:05:36 +03:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/vaultwarden#2461