[euvr] Subscription/Billing updates #1576

vincentsalucci · 2022-03-31T22:06:52Z

Type of change

Objective

Update the Settings section to house a new Subscription menu option with the potential for Go Premium/Premium Membership/ Payment Method / Billing History tabs
SG-19

Code changes

organization-billing.component.html: Copied over existing user-billing.component.html to maintain backwards compatibility for organizational settings (to be updated in the near future)
organization-billing.component.ts: Removed base class and gave this component all the capabilities necessary to maintain backwards compatibility for organizational settings (to be updated in the near future)
oss-routing.module.ts: Updated routing to match new design pattern
oss.module.ts: Added newly created components
payment-method.component.html: Created. Took useful pieces from the user-billing.component
payment-method.component.ts: Created. Took useful pieces from the user-billing.component
premium.component.html: Updated to match new design. Updated with new CL components where applicable
premium.component.ts: Updated route to redirect when a user already has premium
settings.component.html: Removed old navigation items and replaced with single Subscription option
settings.component.ts: Added additional logic that will handle hiding the Subscription option under certain conditions.
subscription.component.html: Created container for routing to selected tabs within the Subscription navigation option
subscription.component.ts: Created. Handles supply of any logic needed for adjusting routes
subscription.module.ts: Created. Handles lazy loading of child routes for the Subscription navigation option
user-billing.component.html: Removed all payment-method related UI and updated with new CL components where applicable
user-billing..component.ts: Removed all payment-method variables/logic/methods
user-subscription.component.html: Adjusted for updated designs. uUpdated with new CL components where applicable
user-subscription.component.ts: Added helper method for title change. Updated navigation scheme on redirect.
messages.json: Added billingHistory

Screenshots

Hidden Subscription due to proper conditions

Testing requirements

Subscription flows for both cloud and self-hosted
Organizational billing (should work as it currently does - need regression)

Dependency

jslib - Separate Billing API

Before you submit

I have checked for linting errors (npm run lint) (required)
This change requires a documentation update (notify the documentation team)
This change has particular deployment requirements (notify the DevOps team)

eliykat

Nice work! Just some smaller comments.

src/app/settings/premium.component.html

src/app/settings/settings.component.ts

src/app/settings/user-billing.component.html

src/app/settings/user-subscription.component.ts

addisonbeck · 2022-04-18T13:26:23Z

It looks like this PR is targeting Feature/EndUserVaultRefresh. There were some concerns raised from others about pascal case breaking some git clients. Can we change this to target feature/endUserVaultRefresh?

vincentsalucci · 2022-04-18T15:51:55Z

It looks like this PR is targeting Feature/EndUserVaultRefresh. There were some concerns raised from others about pascal case breaking some git clients. Can we change this to target feature/endUserVaultRefresh?

@addisonbeck - I saw that was mentioned in chat but had no idea we officially switched to feature/endUserVaultRefresh. I've also merged code into the now obsolete branch. I will cherry-pick to the new branch and try to re-point this one. Maybe that's why my build is broken /shrug

eliykat · 2022-04-19T09:48:12Z

@vincentsalucci I'm making changes to these files in master for EC-74 - here's the diff so far: https://github.com/bitwarden/web/compare/feature/msp-hide-billing

This is going to cause a merge conflict as soon as we merge feature/endUserVaultRefresh into master, which will not have an obvious resolution.

What do you think about creating the standalone organization-billing.component in master first, as a separate PR? Then you can merge that change through into these feature branches, and I can safely make EC-74 changes to the org billing component without affecting EUVR work.

src/app/organizations/settings/organization-billing.component.ts

vincentsalucci · 2022-04-19T20:45:01Z

@vincentsalucci I'm making changes to these files in master for EC-74 - here's the diff so far: https://github.com/bitwarden/web/compare/feature/msp-hide-billing

This is going to cause a merge conflict as soon as we merge feature/endUserVaultRefresh into master, which will not have an obvious resolution.

What do you think about creating the standalone organization-billing.component in master first, as a separate PR? Then you can merge that change through into these feature branches, and I can safely make EC-74 changes to the org billing component without affecting EUVR work.

@eliykat I will work on this asap to try and get it to you soon ™️

eliykat · 2022-04-21T23:01:34Z

@vincentsalucci I'm making changes to these files in master for EC-74 - here's the diff so far: https://github.com/bitwarden/web/compare/feature/msp-hide-billing
This is going to cause a merge conflict as soon as we merge feature/endUserVaultRefresh into master, which will not have an obvious resolution.
What do you think about creating the standalone organization-billing.component in master first, as a separate PR? Then you can merge that change through into these feature branches, and I can safely make EC-74 changes to the org billing component without affecting EUVR work.

@eliykat I will work on this asap to try and get it to you soon ™️

Sorry, turns out I won't actually be touching this component, so you don't need to worry about this extra work. Please proceed with the original PR as you were :)

eliykat

2 differences I noticed from the wireframes - not sure if it's intentional:

The wireframe has the Premium Membership tab laid out more vertically:

Compare to the current layout:

You have a divider line under your headings, whereas the Figma doesn't - also visible in the screenshots above. The reason I noticed is that it starts to carve up the page a little especially in Billing History:

If design says it's fine then it's fine, just checking.

src/app/settings/user-subscription.component.html

vincentsalucci · 2022-05-06T15:02:57Z

2 differences I noticed from the wireframes - not sure if it's intentional:

The wireframe has the Premium Membership tab laid out more vertically:

Compare to the current layout:

You have a divider line under your headings, whereas the Figma doesn't - also visible in the screenshots above. The reason I noticed is that it starts to carve up the page a little especially in Billing History:

If design says it's fine then it's fine, just checking.

This is my fault overall - but since this wasn't mentioned at all in the task breakdown, I completely overlooked the new layout, but I'm also not sure its intentional as this is pretty far from what's in place today. I will check-in with design.
Fixed this - I made the changes while the builds were broken and wasn't able to test it until now. I've updated the related sass to remove dividers for tabbed pages and also adjusted the margins to closer resemble the wireframes.

…abbed pages

vincentsalucci · 2022-05-06T18:04:17Z

@eliykat Talked with design - they've updated the wireframes to match what we currently have in place.

src/app/settings/user-billing-history.component.ts

Hinton · 2022-05-06T19:50:26Z

src/app/organizations/settings/organization-billing.component.ts

+    if (this.organizationId != null) {
+      this.billing = await this.apiService.getOrganizationBilling(this.organizationId);
+    }


Can we enter this component without an orgnaizationId?

After reviewing the routing module/permissions for this component, it appears the answer to your question is no. This is just leftover from temporarily porting over the super class until the admin vault refresh is complete.

@vincentsalucci can you ensure we have a ticket for to ensure this gets completed in the admin refresh?

src/app/settings/payment-method.component.html

Hinton · 2022-05-06T19:52:49Z

src/app/settings/premium.component.html

+<div *ngIf="selfHosted" class="page-header">
+  <h1>{{ "subscription" | i18n }}</h1>
+</div>
+<div *ngIf="!selfHosted" class="tabbed-header">


We are using a different pattern here than in src/app/settings/user-subscription.component.html. We should pick one.

That's because of the pre-existing loading pattern that's in place for the user-subscription component. I didn't feel that it was within scope to try and restructure that for the sole purpose of supplying a header text.

@vincentsalucci can you ensure we have a tech debt ticket for this in the SG pod?

Hinton

Approving this, assuming that we tackle the comments in a tech debt item afterwards.

Stale, comment addressed.

* Add premium badge component (#1525) * [Vault Refresh] Nav update and Options -> Preferences (#1530) * Update jslib * [End User Vault Refresh] Security sub-page (#1538) * [End User Vault Refresh] Security section * Updated routing module * Update routing for change-password * Updated buttons of all modified classes // imported button module * Converted modified class to use bit-callout * removed comments * Update small button to current cl button * Update jslib and consequential updates * [End User Vault Refresh] Vault - remove Org and Provider cards (#1529) * Update reports page (#1536) * [End User Vault Refresh] Organizations - updated nav and route permissions (#1551) * Add Organizations link to navbar * Update route permissions and guards * Use NavigationPermissionsService to unify route permissions * Rename "My Vault" to "Vaults" (#1569) * [euvr] Adjust Vault width based on card visibility (#1588) * [SG-31 End User Vault Refresh] Account Menu updates (#1596) * Add menuModule * Use bit-menu for account menu * Fix styling, replace CSS with TW * Change out bootstrap styling * Fix styling * Fix styling * Rename My Account to Account Settings * WIP use Avatar for account menu * Revert "WIP use Avatar for account menu" This reverts commit d58bea4. * Update jslib from feature branch * [End User Vault Refresh] SG-16: Organization filters (#1595) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * [fix] Use correct filter-buttons class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [SG-32] Add Ownership badge to vault items (#1623) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * Add organization owner badge to vault items * Fix capitalization * Re-organize new components into modules * Use tailwind css class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [EUVR] Merge master into feature branch (#1637) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) * Contribution Documentation edits (#1599) Making corrections to the mobile contributions doc: Update Crowdin contact from Kyle to dwbit. Update 'User-to-User Support' forum category to 'Ask the Bitwarden Community' * Add description for the A-Z & a-z items (#1615) * Add description for reports message (#1600) Add "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault" description to the source string, "Identify and close security gaps in your online accounts by clicking the reports below." * [PS-301] Load OssModule from BitwardenLicense (#1626) * Bumped version to 2.28.1 (#1629) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-154] [BEEEP] Remove factory providers in Angular DI (#1609) * use InjectionTokens * Use InitService * PS-79 Updated two-factor component to to align to jslib change to send the deviceId on 2fa email resend code (#1624) * [PS-74] Fix user authentication state checks (#1632) * Update to use new authStatus method * Delete unused services and import * update jslib * [PS-381] Fix locale being empty when not configuring a language (#1631) * Forwarded email providers to username generator (#1628) * forwarded emails * firefox relay * remove firefox relay * update jslib ref * remove dupe logService * Update localization description for 'random' (#1633) Adding description string for 'random' * DEVOPS-758 - Move Web deploy from GitHub Pages to CloudFlare Pages (#1627) * Update jslib * Run npm i after merge with master * Update name of UserVerificationComponent * Fix lazy loading of routing modules * Routing modules should have routing in their name * Revert "Fix lazy loading of routing modules" This reverts commit 59d4e6e. * Do not eagerly load feature modules Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * Do not render org options menu until loaded (#1638) * [SG-31 End User Vault Refresh] Update cipher options menu (#1593) * Update Vault cipher option menus * Update Send list to use same style * [SG-207] [EUVR] Remove Organizations from Settings page (#1619) * [fix] Cut off overflow text for link buttons (#1639) * [SG-225] Remove BaseGuard (#1641) * [SG-34 End User Vault Refresh] Organization Switcher (#1550) * [euvr] Subscription/Billing updates (#1576) * [euvr] Subscription changes * Revert testing bang * Removed final instance of getUserBilling * Moved to feature/endUserVaultRefresh remote branch and updated to latest * Removed org-billing changes * Updated premium component header * Updated stateservice path * Updated billing component name * Reverting org-billing decouple * Using tailwind classes for CL objects * Added TODO * Removed divider for components within new tab nav * Update jslib/add components to loose-components module * Updated routing lazy load module name to match existing pattern * Fixed bug with redirect // Added button type // Removed headers for tabbed pages * Revert changes to .gitmodules * [dep] Update jslib Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>

* [EC-142] Fix error during import of 1pux containing new email field format (#1585) * Pull in changes made on bitwarden/jslib#758 * Update package-lock.json * Add descriptions to vague messages (#1586) * Add descriptions to vague messages * Fix typo * Autosync the updated translations (#1590) Co-authored-by: github-actions <> * Bumping the pinned commit for the download-artifact to bypass the github api issue (#1598) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) * Contribution Documentation edits (#1599) Making corrections to the mobile contributions doc: Update Crowdin contact from Kyle to dwbit. Update 'User-to-User Support' forum category to 'Ask the Bitwarden Community' * Add description for the A-Z & a-z items (#1615) * Add description for reports message (#1600) Add "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault" description to the source string, "Identify and close security gaps in your online accounts by clicking the reports below." * [PS-301] Load OssModule from BitwardenLicense (#1626) * Bumped version to 2.28.1 (#1629) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-154] [BEEEP] Remove factory providers in Angular DI (#1609) * use InjectionTokens * Use InitService * PS-79 Updated two-factor component to to align to jslib change to send the deviceId on 2fa email resend code (#1624) * [PS-74] Fix user authentication state checks (#1632) * Update to use new authStatus method * Delete unused services and import * update jslib * [PS-381] Fix locale being empty when not configuring a language (#1631) * Forwarded email providers to username generator (#1628) * forwarded emails * firefox relay * remove firefox relay * update jslib ref * remove dupe logService * Update localization description for 'random' (#1633) Adding description string for 'random' * DEVOPS-758 - Move Web deploy from GitHub Pages to CloudFlare Pages (#1627) * [EC-189] Resolve password reprompt not appearing on linkable cipher (#1643) * [SG-220] End User Vault Refresh (#1640) * Add premium badge component (#1525) * [Vault Refresh] Nav update and Options -> Preferences (#1530) * Update jslib * [End User Vault Refresh] Security sub-page (#1538) * [End User Vault Refresh] Security section * Updated routing module * Update routing for change-password * Updated buttons of all modified classes // imported button module * Converted modified class to use bit-callout * removed comments * Update small button to current cl button * Update jslib and consequential updates * [End User Vault Refresh] Vault - remove Org and Provider cards (#1529) * Update reports page (#1536) * [End User Vault Refresh] Organizations - updated nav and route permissions (#1551) * Add Organizations link to navbar * Update route permissions and guards * Use NavigationPermissionsService to unify route permissions * Rename "My Vault" to "Vaults" (#1569) * [euvr] Adjust Vault width based on card visibility (#1588) * [SG-31 End User Vault Refresh] Account Menu updates (#1596) * Add menuModule * Use bit-menu for account menu * Fix styling, replace CSS with TW * Change out bootstrap styling * Fix styling * Fix styling * Rename My Account to Account Settings * WIP use Avatar for account menu * Revert "WIP use Avatar for account menu" This reverts commit d58bea4. * Update jslib from feature branch * [End User Vault Refresh] SG-16: Organization filters (#1595) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * [fix] Use correct filter-buttons class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [SG-32] Add Ownership badge to vault items (#1623) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * Add organization owner badge to vault items * Fix capitalization * Re-organize new components into modules * Use tailwind css class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [EUVR] Merge master into feature branch (#1637) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) * Contribution Documentation edits (#1599) Making corrections to the mobile contributions doc: Update Crowdin contact from Kyle to dwbit. Update 'User-to-User Support' forum category to 'Ask the Bitwarden Community' * Add description for the A-Z & a-z items (#1615) * Add description for reports message (#1600) Add "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault" description to the source string, "Identify and close security gaps in your online accounts by clicking the reports below." * [PS-301] Load OssModule from BitwardenLicense (#1626) * Bumped version to 2.28.1 (#1629) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-154] [BEEEP] Remove factory providers in Angular DI (#1609) * use InjectionTokens * Use InitService * PS-79 Updated two-factor component to to align to jslib change to send the deviceId on 2fa email resend code (#1624) * [PS-74] Fix user authentication state checks (#1632) * Update to use new authStatus method * Delete unused services and import * update jslib * [PS-381] Fix locale being empty when not configuring a language (#1631) * Forwarded email providers to username generator (#1628) * forwarded emails * firefox relay * remove firefox relay * update jslib ref * remove dupe logService * Update localization description for 'random' (#1633) Adding description string for 'random' * DEVOPS-758 - Move Web deploy from GitHub Pages to CloudFlare Pages (#1627) * Update jslib * Run npm i after merge with master * Update name of UserVerificationComponent * Fix lazy loading of routing modules * Routing modules should have routing in their name * Revert "Fix lazy loading of routing modules" This reverts commit 59d4e6e. * Do not eagerly load feature modules Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * Do not render org options menu until loaded (#1638) * [SG-31 End User Vault Refresh] Update cipher options menu (#1593) * Update Vault cipher option menus * Update Send list to use same style * [SG-207] [EUVR] Remove Organizations from Settings page (#1619) * [fix] Cut off overflow text for link buttons (#1639) * [SG-225] Remove BaseGuard (#1641) * [SG-34 End User Vault Refresh] Organization Switcher (#1550) * [euvr] Subscription/Billing updates (#1576) * [euvr] Subscription changes * Revert testing bang * Removed final instance of getUserBilling * Moved to feature/endUserVaultRefresh remote branch and updated to latest * Removed org-billing changes * Updated premium component header * Updated stateservice path * Updated billing component name * Reverting org-billing decouple * Using tailwind classes for CL objects * Added TODO * Removed divider for components within new tab nav * Update jslib/add components to loose-components module * Updated routing lazy load module name to match existing pattern * Fixed bug with redirect // Added button type // Removed headers for tabbed pages * Revert changes to .gitmodules * [dep] Update jslib Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * [EC-196] Move provider last in navbar (#1647) * [euvr] Settings -> Account Settings label (#1648) * Check for null cipher in edit (#1646) Null ciphers signify a _new_ cipher, so no password repromt is required * [fix] Add missing Create Org button to filters (#1650) * update jslib * Fix package-lock * Fix component declarations Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>

* Remove F4E card from vault page * Billing Sync Api Keys / Free Bitwarden Families Page updates (#1597) * Work on billing sync key maintenance * Work on i18n * Work on localizations * Work on sync status text * Work on sync status copy * Assign default null value * Work on billing sync UI * Work on sponsorships page * Add inline form validation * Fix lint * Prettier * Final touches on designs from Figma * Polish * Address PR feedback * Use more generic validator * Update jslib * Update jslib * Remove comment * [PS-248] Feature/manage billing sync connection (#1601) * Fix modal footer rounded corners * Add billing sync messages * Add manage billing sync to self hosted org subscription component * Handle create vs update in component * Update src/app/settings/billing-sync-key.component.html Co-authored-by: Justin Baur <admin@justinbaur.com> * update jslib * Linter fixes * Remove duplicate modalService Co-authored-by: Justin Baur <admin@justinbaur.com> * Fix/f4e self hosting section (#1616) * Translate messages * Move download license subform to below download license button * Chore/merge/self hosted families for enterprise (#1617) * [EC-142] Fix error during import of 1pux containing new email field format (#1585) * Pull in changes made on bitwarden/jslib#758 * Update package-lock.json * Add descriptions to vague messages (#1586) * Add descriptions to vague messages * Fix typo * Autosync the updated translations (#1590) Co-authored-by: github-actions <> * Bumping the pinned commit for the download-artifact to bypass the github api issue (#1598) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * update jslib Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> * Chore/merge/self hosted families for enterprise (#1621) * [EC-142] Fix error during import of 1pux containing new email field format (#1585) * Pull in changes made on bitwarden/jslib#758 * Update package-lock.json * Add descriptions to vague messages (#1586) * Add descriptions to vague messages * Fix typo * Autosync the updated translations (#1590) Co-authored-by: github-actions <> * Bumping the pinned commit for the download-artifact to bypass the github api issue (#1598) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> * Change to new name (#1642) * Chore/merge/self hosted families for enterprise (#1651) * [EC-142] Fix error during import of 1pux containing new email field format (#1585) * Pull in changes made on bitwarden/jslib#758 * Update package-lock.json * Add descriptions to vague messages (#1586) * Add descriptions to vague messages * Fix typo * Autosync the updated translations (#1590) Co-authored-by: github-actions <> * Bumping the pinned commit for the download-artifact to bypass the github api issue (#1598) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) * Contribution Documentation edits (#1599) Making corrections to the mobile contributions doc: Update Crowdin contact from Kyle to dwbit. Update 'User-to-User Support' forum category to 'Ask the Bitwarden Community' * Add description for the A-Z & a-z items (#1615) * Add description for reports message (#1600) Add "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault" description to the source string, "Identify and close security gaps in your online accounts by clicking the reports below." * [PS-301] Load OssModule from BitwardenLicense (#1626) * Bumped version to 2.28.1 (#1629) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-154] [BEEEP] Remove factory providers in Angular DI (#1609) * use InjectionTokens * Use InitService * PS-79 Updated two-factor component to to align to jslib change to send the deviceId on 2fa email resend code (#1624) * [PS-74] Fix user authentication state checks (#1632) * Update to use new authStatus method * Delete unused services and import * update jslib * [PS-381] Fix locale being empty when not configuring a language (#1631) * Forwarded email providers to username generator (#1628) * forwarded emails * firefox relay * remove firefox relay * update jslib ref * remove dupe logService * Update localization description for 'random' (#1633) Adding description string for 'random' * DEVOPS-758 - Move Web deploy from GitHub Pages to CloudFlare Pages (#1627) * [EC-189] Resolve password reprompt not appearing on linkable cipher (#1643) * [SG-220] End User Vault Refresh (#1640) * Add premium badge component (#1525) * [Vault Refresh] Nav update and Options -> Preferences (#1530) * Update jslib * [End User Vault Refresh] Security sub-page (#1538) * [End User Vault Refresh] Security section * Updated routing module * Update routing for change-password * Updated buttons of all modified classes // imported button module * Converted modified class to use bit-callout * removed comments * Update small button to current cl button * Update jslib and consequential updates * [End User Vault Refresh] Vault - remove Org and Provider cards (#1529) * Update reports page (#1536) * [End User Vault Refresh] Organizations - updated nav and route permissions (#1551) * Add Organizations link to navbar * Update route permissions and guards * Use NavigationPermissionsService to unify route permissions * Rename "My Vault" to "Vaults" (#1569) * [euvr] Adjust Vault width based on card visibility (#1588) * [SG-31 End User Vault Refresh] Account Menu updates (#1596) * Add menuModule * Use bit-menu for account menu * Fix styling, replace CSS with TW * Change out bootstrap styling * Fix styling * Fix styling * Rename My Account to Account Settings * WIP use Avatar for account menu * Revert "WIP use Avatar for account menu" This reverts commit d58bea4. * Update jslib from feature branch * [End User Vault Refresh] SG-16: Organization filters (#1595) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * [fix] Use correct filter-buttons class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [SG-32] Add Ownership badge to vault items (#1623) * [feature] Base implementation of EUVR filter changes * [refactor] Relocated vault-filters to app/modules * [refactor] Reuse vault-filters component for organizations * [refactor] Remove unused org filter component * [bug] .gitmodules branch change * [bug] Load organization filters after sync during login * [refactor] Introduce a SharedModule * [refactor] Created a home for loose components * [refactor] Convert VaultComponent and OrgVaultComponent into a pair of modules * [refactor] Implement <bit-menu> for organization filter actions * [feature] Improve a11y standards of the vault filters module * [bug] Recreate package-lock.json * Fix build issue * [bug] Remove duplicate this.go() call * Add organization owner badge to vault items * Fix capitalization * Re-organize new components into modules * Use tailwind css class Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com> * [EUVR] Merge master into feature branch (#1637) * Update jslib (#1602) * Update jslib * Update name of UserVerificationComponent * Bumped version to 2.28.0 (#1603) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-161] Bump braintree (#1606) * [PS-211] [PS-212] Make Generator page accessible (#1607) * Fix grouping of radiobutton inputs * Add role=radiogroup * Add aria-labelledBy to radio button groups * Add reorganization notice (#1610) * Add aria attributes to password gen options (#1611) * [EC-143] [BEEEP] Allow linking to ciphers (#1579) Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix login sponsorship redirect (#1620) * Contribution Documentation edits (#1599) Making corrections to the mobile contributions doc: Update Crowdin contact from Kyle to dwbit. Update 'User-to-User Support' forum category to 'Ask the Bitwarden Community' * Add description for the A-Z & a-z items (#1615) * Add description for reports message (#1600) Add "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault" description to the source string, "Identify and close security gaps in your online accounts by clicking the reports below." * [PS-301] Load OssModule from BitwardenLicense (#1626) * Bumped version to 2.28.1 (#1629) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-154] [BEEEP] Remove factory providers in Angular DI (#1609) * use InjectionTokens * Use InitService * PS-79 Updated two-factor component to to align to jslib change to send the deviceId on 2fa email resend code (#1624) * [PS-74] Fix user authentication state checks (#1632) * Update to use new authStatus method * Delete unused services and import * update jslib * [PS-381] Fix locale being empty when not configuring a language (#1631) * Forwarded email providers to username generator (#1628) * forwarded emails * firefox relay * remove firefox relay * update jslib ref * remove dupe logService * Update localization description for 'random' (#1633) Adding description string for 'random' * DEVOPS-758 - Move Web deploy from GitHub Pages to CloudFlare Pages (#1627) * Update jslib * Run npm i after merge with master * Update name of UserVerificationComponent * Fix lazy loading of routing modules * Routing modules should have routing in their name * Revert "Fix lazy loading of routing modules" This reverts commit 59d4e6e. * Do not eagerly load feature modules Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * Do not render org options menu until loaded (#1638) * [SG-31 End User Vault Refresh] Update cipher options menu (#1593) * Update Vault cipher option menus * Update Send list to use same style * [SG-207] [EUVR] Remove Organizations from Settings page (#1619) * [fix] Cut off overflow text for link buttons (#1639) * [SG-225] Remove BaseGuard (#1641) * [SG-34 End User Vault Refresh] Organization Switcher (#1550) * [euvr] Subscription/Billing updates (#1576) * [euvr] Subscription changes * Revert testing bang * Removed final instance of getUserBilling * Moved to feature/endUserVaultRefresh remote branch and updated to latest * Removed org-billing changes * Updated premium component header * Updated stateservice path * Updated billing component name * Reverting org-billing decouple * Using tailwind classes for CL objects * Added TODO * Removed divider for components within new tab nav * Update jslib/add components to loose-components module * Updated routing lazy load module name to match existing pattern * Fixed bug with redirect // Added button type // Removed headers for tabbed pages * Revert changes to .gitmodules * [dep] Update jslib Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: Matt Gibson <mgibson@bitwarden.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * [EC-196] Move provider last in navbar (#1647) * [euvr] Settings -> Account Settings label (#1648) * Check for null cipher in edit (#1646) Null ciphers signify a _new_ cipher, so no password repromt is required * [fix] Add missing Create Org button to filters (#1650) * update jslib * Fix package-lock * Fix component declarations Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> * Update jslib * update jslib Co-authored-by: Justin Baur <admin@justinbaur.com> Co-authored-by: Justin Baur <136baur@gmail.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Oscar Hinton <oscar@oscarhinton.com> Co-authored-by: dwbit <98768076+dwbit@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com> Co-authored-by: addison <addisonbeck1@gmail.com> Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>

[euvr] Subscription changes

99a6439

vincentsalucci added the enhancement label Mar 31, 2022

vincentsalucci requested a review from a team March 31, 2022 22:06

vincentsalucci self-assigned this Mar 31, 2022

vincentsalucci added 3 commits March 31, 2022 17:07

Revert testing bang

b0c7f39

Removed final instance of getUserBilling

77f45d1

Moved to feature/endUserVaultRefresh remote branch and updated to latest

152305b

vincentsalucci marked this pull request as ready for review April 11, 2022 16:06

differsthecat mentioned this pull request Apr 15, 2022

[End User Vault Refresh] SG-16: Organization filters #1595

Merged

8 tasks

eliykat suggested changes Apr 18, 2022

View reviewed changes

vincentsalucci changed the base branch from Feature/EndUserVaultRefresh to feature/endUserVaultRefresh April 18, 2022 17:14

Merge branch 'feature/endUserVaultRefresh' into euvr/settings-billing

23cae30

eliykat reviewed Apr 19, 2022

View reviewed changes

src/app/organizations/settings/organization-billing.component.ts Show resolved Hide resolved

vincentsalucci added 4 commits April 20, 2022 11:11

Removed org-billing changes

65aef5e

Updated premium component header

6e94e74

Updated stateservice path

0c4fd74

Updated billing component name

d80324d

vincentsalucci added 8 commits April 22, 2022 08:59

Reverting org-billing decouple

6d786d4

Merge branch 'feature/endUserVaultRefresh' into euvr/settings-billing

4f3d1ae

Using tailwind classes for CL objects

6dbffb8

Added TODO

c564cbf

Removed divider for components within new tab nav

00d76e6

Merge branch 'feature/endUserVaultRefresh' into euvr/settings-billing

37e28b3

Update jslib/add components to loose-components module

8276f82

Merge branch 'feature/endUserVaultRefresh' into euvr/settings-billing

69e5a0f

Updated routing lazy load module name to match existing pattern

1d42dd6

eliykat reviewed May 5, 2022

View reviewed changes

eliykat previously requested changes May 5, 2022

View reviewed changes

src/app/settings/user-subscription.component.html Show resolved Hide resolved

eliykat mentioned this pull request May 5, 2022

[SG-220] End User Vault Refresh #1640

Merged

14 tasks

Merge branch 'feature/endUserVaultRefresh' into euvr/settings-billing

501250d

Fixed bug with redirect // Added button type // Removed headers for t…

8c11bca

…abbed pages

vincentsalucci requested review from Hinton and eliykat May 6, 2022 18:04

Hinton suggested changes May 6, 2022

View reviewed changes

Hinton approved these changes May 6, 2022

View reviewed changes

addisonbeck merged commit 1a3827c into feature/endUserVaultRefresh May 9, 2022

addisonbeck deleted the euvr/settings-billing branch May 9, 2022 01:01

[euvr] Subscription/Billing updates #1576

[euvr] Subscription/Billing updates #1576

Uh oh!

Conversation

vincentsalucci commented Mar 31, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of change

Objective

Code changes

Screenshots

Testing requirements

Dependency

Before you submit

Uh oh!

eliykat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

addisonbeck commented Apr 18, 2022

Uh oh!

vincentsalucci commented Apr 18, 2022

Uh oh!

eliykat commented Apr 19, 2022

Uh oh!

Uh oh!

vincentsalucci commented Apr 19, 2022

Uh oh!

eliykat commented Apr 21, 2022

Uh oh!

eliykat left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vincentsalucci commented May 6, 2022

Uh oh!

vincentsalucci commented May 6, 2022

Uh oh!

Uh oh!

Uh oh!

Hinton May 6, 2022

Choose a reason for hiding this comment

Uh oh!

vincentsalucci May 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Hinton May 9, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Hinton May 6, 2022

Choose a reason for hiding this comment

Uh oh!

vincentsalucci May 6, 2022

Choose a reason for hiding this comment

Uh oh!

Hinton May 9, 2022

Choose a reason for hiding this comment

Uh oh!

Hinton left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vincentsalucci commented Mar 31, 2022 •

edited

Loading

eliykat left a comment •

edited

Loading

vincentsalucci May 6, 2022 •

edited

Loading