[PM-14366] Deprecated active user state from billing state service #12273

cturnbull-bitwarden · 2024-12-06T16:20:12Z

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-14366

📔 Objective

This PR updates the BillingAccountProfileStateService to remove its dependency on ActiveUserStateProvider by requiring explicit user IDs when checking premium status. This change:

Modifies the service's public observables to accept a userId parameter instead of relying on the active user state
Removes the internal state tracking of the active user
Updates all consumers of the service to pass the active user's ID by combining with AccountService.activeAccount$, often via a switchMap, or otherwise, firstValueFrom

📸 Screenshots

⏰ Reminders before review

Contributor guidelines followed
All formatters and local linters executed and passed
Written new unit and / or integration tests where applicable
Protected functional changes with optionality (feature flags)
Used internationalization (i18n) for all UI strings
CI builds passed
Communicated to DevOps any deployment requirements
Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

👍 (:+1:) or similar for great changes
📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
❓ (:question:) for questions
🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
🎨 (:art:) for suggestions / improvements
❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
⛏ (:pick:) for minor or nitpick changes

github-actions · 2024-12-06T16:28:42Z

Checkmarx One – Scan Summary & Details – e0bf3f45-8d1b-48bf-8dbd-1112155f7e06

New Issues

Severity	Issue	Source File / Package	Checkmarx Insight
	Client_JQuery_Deprecated_Symbols	/apps/browser/src/background/runtime.background.ts: 91	Attack Vector

Fixed Issues

Severity	Issue	Source File / Package
	Client_Privacy_Violation	/apps/browser/src/autofill/deprecated/overlay/pages/list/autofill-overlay-list.deprecated.ts: 393
	Client_Privacy_Violation	/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html: 15

…e-provider

apps/web/src/app/layouts/user-layout.component.ts

Co-authored-by: ✨ Audrey ✨ <[email protected]>

gbubemismith

Just added a few suggestions and pointed out some failing tests. Thanks for working on this

libs/angular/src/vault/components/view.component.ts

apps/web/src/app/vault/individual-vault/vault.component.ts

apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts

apps/web/src/app/vault/individual-vault/add-edit.component.ts

gbubemismith · 2024-12-11T16:49:55Z

apps/cli/src/vault/create.command.ts

-      cipher.organizationId == null &&
-      !(await firstValueFrom(this.accountProfileService.hasPremiumFromAnySource$))
-    ) {
+    const account = await firstValueFrom(this.accountService.activeAccount$);


I think we can delete this and move the activeUserId declared on L155 out of the try scope

...c/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts

…e-provider

…e-provider # Conflicts: # apps/desktop/src/vault/app/vault/vault.component.ts

…e-provider # Conflicts: # apps/browser/src/vault/popup/components/action-buttons.component.ts

cturnbull-bitwarden added 2 commits December 6, 2024 11:08

Updated billing state provider to not rely on ActiveUserStateProvider

79f0f64

Updated usages

056fbfe

cturnbull-bitwarden requested review from a team as code owners December 6, 2024 16:20

cturnbull-bitwarden requested review from vleague2, justindbaur, shane-melton and ike-kottlowski December 6, 2024 16:20

cturnbull-bitwarden marked this pull request as draft December 6, 2024 16:21

cturnbull-bitwarden added 6 commits December 6, 2024 12:39

Merge branch 'main' into billing/PM-14366/deprectete-active-user-stat…

e943dc9

…e-provider

Resolved browser build

79e02e1

Resolved web build

5f5d38e

Resolved CLI build

4643a64

resolved desktop build

e9d9ec9

Merge branch 'main' into billing/PM-14366/deprectete-active-user-stat…

8232a72

…e-provider

cturnbull-bitwarden marked this pull request as ready for review December 6, 2024 19:38

cturnbull-bitwarden requested review from a team as code owners December 6, 2024 19:38

cturnbull-bitwarden requested a review from BTreston December 6, 2024 19:38

This comment was marked as resolved.

Sign in to view

willmartian requested changes Dec 9, 2024

View reviewed changes

apps/web/src/app/layouts/user-layout.component.ts Outdated Show resolved Hide resolved

shane-melton requested a review from gbubemismith December 9, 2024 16:59

Update apps/cli/src/tools/send/commands/create.command.ts

55e6f24

Co-authored-by: ✨ Audrey ✨ <[email protected]>

gbubemismith requested changes Dec 11, 2024

View reviewed changes

Merge branch 'main' into billing/PM-14366/deprectete-active-user-stat…

39c8a0d

…e-provider

BTreston previously approved these changes Jan 6, 2025

View reviewed changes

JaredSnider-Bitwarden previously approved these changes Jan 6, 2025

View reviewed changes

JaredSnider-Bitwarden removed the request for review from ike-kottlowski January 6, 2025 19:12

Merge branch 'main' into billing/PM-14366/deprectete-active-user-stat…

bc195b3

…e-provider # Conflicts: # apps/desktop/src/vault/app/vault/vault.component.ts

cturnbull-bitwarden dismissed stale reviews from JaredSnider-Bitwarden, BTreston, willmartian, addisonbeck, audreyality, jonashendrickx, and gbubemismith via bc195b3 January 6, 2025 20:05

cturnbull-bitwarden requested review from BTreston, JaredSnider-Bitwarden, willmartian, addisonbeck, gbubemismith, audreyality and jonashendrickx January 6, 2025 20:17

Merge branch 'main' into billing/PM-14366/deprectete-active-user-stat…

07807f7

…e-provider # Conflicts: # apps/browser/src/vault/popup/components/action-buttons.component.ts

JaredSnider-Bitwarden approved these changes Jan 6, 2025

View reviewed changes

audreyality approved these changes Jan 6, 2025

View reviewed changes

gbubemismith approved these changes Jan 6, 2025

View reviewed changes

addisonbeck approved these changes Jan 6, 2025

View reviewed changes

BTreston approved these changes Jan 6, 2025

View reviewed changes

willmartian approved these changes Jan 6, 2025

View reviewed changes

dani-garcia approved these changes Jan 7, 2025

View reviewed changes

jonashendrickx approved these changes Jan 7, 2025

View reviewed changes

jprusik approved these changes Jan 7, 2025

View reviewed changes

cturnbull-bitwarden merged commit 91d6963 into main Jan 7, 2025
84 of 86 checks passed

cturnbull-bitwarden deleted the billing/PM-14366/deprectete-active-user-state-provider branch January 7, 2025 15:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PM-14366] Deprecated active user state from billing state service #12273

[PM-14366] Deprecated active user state from billing state service #12273

cturnbull-bitwarden commented Dec 6, 2024

github-actions bot commented Dec 6, 2024 •

edited

Loading

This comment was marked as resolved.

gbubemismith left a comment

gbubemismith Dec 11, 2024

[PM-14366] Deprecated active user state from billing state service #12273

[PM-14366] Deprecated active user state from billing state service #12273

Conversation

cturnbull-bitwarden commented Dec 6, 2024

🎟️ Tracking

📔 Objective

📸 Screenshots

⏰ Reminders before review

🦮 Reviewer guidelines

github-actions bot commented Dec 6, 2024 • edited Loading

New Issues

Fixed Issues

This comment was marked as resolved.

gbubemismith left a comment

Choose a reason for hiding this comment

gbubemismith Dec 11, 2024

Choose a reason for hiding this comment

github-actions bot commented Dec 6, 2024 •

edited

Loading