1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-04 17:43:39 +00:00
Commit Graph

51 Commits

Author SHA1 Message Date
Thomas Rittson
1c39938cda Merge branch 'feature/sm-billing' into AC-1418-add-secrets-manager-manage-subscription-component 2023-06-29 10:55:39 +10:00
Thomas Rittson
03079735f3 Merge remote-tracking branch 'origin/master' into feature/sm-billing 2023-06-29 10:55:03 +10:00
Shane Melton
8ffddd953c [AC-1418] Simplify monthly price calculation 2023-06-28 14:19:34 -07:00
Shane Melton
001f1d4ccb [AC-1418] Add missing currency codes 2023-06-28 13:58:41 -07:00
Shane Melton
7d47ea294f [AC-1418] Update SM seat count minimum to 1 2023-06-28 13:57:08 -07:00
Andreas Coroiu
a73525a80c [PM-2135] [BEEEP] Refactor and refresh web user verification components (#5377)
* [PM-2135] feat: create new user-verification module

* [PM-2136] feat: add ability to remove form field bottom margin

(cherry picked from commit 05925ff77ed47f3865c2aecade8271390d9e2fa6)

* [PM-2135] feat: refactor user-verification component

* [PM-2135] feat: refactor user-verification-prompt

* [PM-2135] feat: use form validation in prompt

* [PM-2135] feat: change autofocus target

* [PM-2135] chore: clean up old code

* [PM-2135] feat: allow user verification to show invalid password error

* [PM-2135] feat: hack mark as touched to get error to display

* [PM-2135] chore: move to auth

* [PM-2135] fix: hardcoded dialog buttons

* [PM-2135] feat: add onDestroy handler

* [PM-2135] fix: remove unecessary directive input

* [PM-2135] feat: add password toggle

* [PM-2135] chore: add hack comment

* [PM-2135] chore: move services to auth folder and rename

* [PM-2135] fix: show correct error messages

* [PM-2135] fix: re-add non-existant files to whitelist

I honestly don't know why the linter is complaining about this

* Fix capital letters whitelist

* [PM-2135] chore: remove rows that were mistakenly added during merge from master

* [PM-2135] chore: remove rows that were mistakenly added during merge from master

* [PM-2135] feat: disable built-in browser validations

* Revert "[PM-2135] feat: disable built-in browser validations"

This reverts commit 969f75822a.

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
2023-06-28 09:02:22 -04:00
Shane Melton
07f20feda2 [AC-1418] Move SM adjust subscription component into SM billing module 2023-06-27 16:50:03 -07:00
Shane Melton
0d5d4b07cc [AC-1418] Cleanup SM subscription UI flags 2023-06-27 16:44:32 -07:00
Shane Melton
dc13c3aea0 [AC-1418] Use new model and service method 2023-06-27 16:40:47 -07:00
Shane Melton
9c85576973 [AC-1418] Revert change to update PM subscription request model 2023-06-27 16:33:31 -07:00
Shane Melton
b73387cac9 [AC-1418] Cleanup BitwardenProductType after merge
Add to barrel file and update applicable imports.
2023-06-27 15:46:30 -07:00
Shane Melton
5f34ba2166 Merge branch 'feature/sm-billing' into AC-1418-add-secrets-manager-manage-subscription-component 2023-06-27 15:46:11 -07:00
Thomas Rittson
86ccff78cb [AC-1420] Add Secrets Manager subscribe component (#5617) 2023-06-23 14:26:59 +10:00
Shane Melton
797ca073b8 [AC-1423] Update organization subscription cloud page (#5614)
* [AC-1423] Add ProgressModule to shared.module.ts

* [AC-1423] Update cloud subscription page styles

- Remove bootstrap styles
- Use CL components where applicable
- Use CL typography directives
- Update heading levels to prepare for new SM sections

* [AC-1423] Add usePasswordManager boolean to organization domain

* [AC-1423] Introduce BitwardenProductType enum

* [AC-1423] Update Organization subscription line items

- Add product type prefix
- Indent addon services like additional storage and service accounts
- Show line items for free plans

* [AC-1423] Simply sort function

* [AC-1423] Remove header border

* [AC-1423] Make "Password Manager" the default fallback for product name
2023-06-23 09:17:38 +10:00
Shane Melton
ccd798beb3 [AC-1418] Hide SM billing adjustment component behind feature flag 2023-06-22 14:46:36 -07:00
Shane Melton
6562813a82 [AC-1418] Use the SM plan for billing interval 2023-06-22 14:32:03 -07:00
Shane Melton
9100b05133 [AC-1418] Adjust labels and appearance to better match design 2023-06-22 14:26:58 -07:00
Shane Melton
f1e9f96e27 [AC-1418] Fix conflicting required/optional labels for auto-scaling limits 2023-06-22 14:12:11 -07:00
Shane Melton
ee82aead64 [AC-1418] Add better docs to options interface 2023-06-22 14:11:44 -07:00
Shane Melton
69b65ea2a8 [AC-1418] Add SM subscription adjust form and logic to hide it 2023-06-22 11:16:12 -07:00
Shane Melton
945289bf05 [AC-1418] Cleanup form html 2023-06-22 11:16:12 -07:00
Shane Melton
bc38cdff11 [AC-1418] Add api service call to update SM subscription 2023-06-22 11:16:12 -07:00
Shane Melton
c3cf745928 [AC-1418] Rename service account fields in the options interface 2023-06-22 11:16:12 -07:00
Shane Melton
e6816aae8e [AC-1418] Adjust organization-subscription-update.request.ts to support both PM and SM 2023-06-22 11:16:12 -07:00
Shane Melton
55eaff06d6 [AC-1418] Add initial SM adjustment form 2023-06-22 11:16:11 -07:00
Shane Melton
c46d522ac8 [AC-1418] Add initial SecretsManagerAdjustSubscription component 2023-06-22 11:16:11 -07:00
Shane Melton
5607f7e4e2 [AC-1423] Tweak sorting comment 2023-06-22 09:25:09 -07:00
Shane Melton
6dd1616b5a Revert "[AC-1423] Switch to AddonProductType enum instead of boolean"
This reverts commit 204f64b4e7.
2023-06-22 09:08:31 -07:00
Shane Melton
204f64b4e7 [AC-1423] Switch to AddonProductType enum instead of boolean 2023-06-21 17:38:49 -07:00
Shane Melton
5ca5b97a30 [AC-1423] Remove minWidth attribute 2023-06-21 17:03:08 -07:00
Shane Melton
72997070ab [AC-1423] Make "Password Manager" the default fallback for product name 2023-06-21 16:58:14 -07:00
Shane Melton
3c904a7ab9 [AC-1423] Remove ineffective div 2023-06-21 16:57:00 -07:00
Shane Melton
be2b72b286 [AC-1423] Remove redundant condition 2023-06-21 16:55:10 -07:00
Shane Melton
894623a80e [AC-1423] Remove header border 2023-06-21 16:52:35 -07:00
Shane Melton
b7d6243f58 [AC-1423] Simply sort function 2023-06-21 16:51:47 -07:00
Shane Melton
69bbea03ba [AC-1423] Update Organization subscription line items
- Add product type prefix
- Indent addon services like additional storage and service accounts
- Show line items for free plans
2023-06-14 09:36:15 -07:00
Shane Melton
ce4fd3425a [AC-1423] Update cloud subscription page styles
- Remove bootstrap styles
- Use CL components where applicable
- Use CL typography directives
- Update heading levels to prepare for new SM sections
2023-06-14 09:36:14 -07:00
Matt Gibson
78248db590 Platform/pm 19/platform team file moves (#5460)
* Rename service-factory folder

* Move cryptographic service factories

* Move crypto models

* Move crypto services

* Move domain base class

* Platform code owners

* Move desktop log services

* Move log files

* Establish component library ownership

* Move background listeners

* Move background background

* Move localization to Platform

* Move browser alarms to Platform

* Move browser state to Platform

* Move CLI state to Platform

* Move Desktop native concerns to Platform

* Move flag and misc to Platform

* Lint fixes

* Move electron state to platform

* Move web state to Platform

* Move lib state to Platform

* Fix broken tests

* Rename interface to idiomatic TS

* `npm run prettier` 🤖

* Resolve review feedback

* Set platform as owners of web core and shared

* Expand moved services

* Fix test types

---------

Co-authored-by: Hinton <hinton@users.noreply.github.com>
2023-06-06 15:34:53 -05:00
Shane Melton
107c9052b8 [AC-1431] Add missing UserVerificationModule import (#5555) 2023-06-05 16:14:24 -07:00
Shane Melton
909d54e326 [AC-358] Update help doc link (#5455) 2023-05-15 12:18:06 -07:00
Shane Melton
bcda04ee86 [AC-358] SelfHosted update subscription page (#5101)
* [AC-358] Add selfHostSubscriptionExpiration property to organization-subscription.response.ts

* [AC-358] Update selfHost org subscription template

- Replace "Subscription" with "SubscriptionExpiration"
- Add question mark help link
- Add helper text for grace period
- Add support for graceful fallback in case of missing grace period in subscription response

* Update libs/common/src/billing/models/response/organization-subscription.response.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-358] Remove unnecessary hypen

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-358] Introduce SelfHostedOrganizationSubscription view
- Encapsulate expiration/grace period logic in the new view object.
- Remove API response getters from the angular component
- Replace the API response object with the new view

* [AC-358] Clarify name for new expiration without grace period field

* [AC-358] Update constructor parameter name

* [AC-358] Simplify new selfhost subscription view

- Make expiration date properties public
- Remove obsolete expiration date getters
- Update the component to use new properties
- Add helper to component for determining if the subscription should be rendered as expired (red text)

* [AC-358] Rename isExpired to isExpiredAndOutsideGracePeriod to be more explicit

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
2023-05-15 07:38:53 -07:00
SmithThe4th
f655460fa7 [PM-1399] Resolve eslint errors for button type - vault (#5274)
* Added button type to each button element related to the vault team

* Removed disable statement comment

* [PM-1399] Resolve eslint errors for button type - admin-console  (#5275)

* Added button type to each button element related to the admin console team

* Added button type to each button element related to the billing team

* Removed disable statement comment

* [PM-1399] Resolve eslint errors for button type - tools (#5284)

* Added button type to each button element related to the tools team

* Added button type to each button element related to the tools team

* Added button type to each button element related to the auth team (#5295)
2023-05-03 10:55:22 -04:00
Oscar Hinton
4e1867682f [PM-1504] Migrate Dialogs to DialogService (#5013)
This PR introduces a generic `DialogService` which can be used by all the clients. This allows us to decouple dialogs from the `PlatformUtilsHelper`.

The `DialogService` provides a new method, `openSimpleDialog` which is the new interface for that type of dialogs.

This gives us 3 different implementations: 
- Web: DialogService modern dialogs
- Browser: SweetAlert
- Desktop: Native electron based
2023-05-02 18:46:03 +02:00
Rui Tomé
e3f31ac741 [AC-1081] Merge feature/billing-obfuscation (#5172)
* [AC-431] Add new organization invite process (#4841)

* [AC-431] Added properties 'key' and 'keys' to OrganizationUserAcceptRequest

* [AC-431] On organization accept added check for 'initOrganization' flag and send encrypt keys if true

* [AC-431] Reverted changes on AcceptOrganizationComponent and OrganizationUserAcceptRequest

* [AC-431] Created OrganizationUserAcceptInitRequest

* [AC-431] Added method postOrganizationUserAcceptInit to OrganizationUserService

* [AC-431] Created AcceptInitOrganizationComponent and added routing config. Added 'inviteInitAcceptedDesc' to messages

* [AC-431] Remove blank line

* [AC-431] Remove requirement for logging in again

* [AC-431] Removed accept-init-organization.component.html

* Update libs/common/src/abstractions/organization-user/organization-user.service.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-431] Sending collection name when initializing an org

* [AC-431] Deleted component accept-init-organization and incorporated logic into accept-organization

* Update libs/common/src/abstractions/organization-user/organization-user.service.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-431] Returning promise chains

* [AC-431] Moved ReAuth check to org accept only

* [AC-431] Fixed import issues

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-434] Hide billing screen for reseller clients (#4955)

* [AC-434] Retrieving ProviderType for each Org

* [AC-434] Hide subscription details if user cannot manage billing

* [AC-434] Renamed providerType to provider-type

* [AC-434] Reverted change that showed Billing History and Payment Methods tabs

* [AC-434] Hiding Secrets Manager enroll

* [AC-434] Renamed Billing access variables to be more readable

* Apply suggestions from code review

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* [AC-434] Reduce duplication in permission code

* [AC-434] npm prettier

* [AC-434] Changed selfhost subscription permission

* [AC-434] Added canEditSubscription check for change plan buttons

* [AC-434] Removed message displaying provider name in subscription

* [AC-434] canEditSubscription logic depends on canViewSubscription

* [AC-434] Hiding next charge value for users without billing edit permission

* [AC-434] Changed canViewSubscription and canEditSubscription to be clearer

* [AC-434] Altered BillingSubscriptionItemResponse.amount and BillingSubscriptionUpcomingInvoiceResponse.amount to nullable

* [AC-434] Reverted change on BillingSubscriptionItemResponse.amount

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* Updated IsPaidOrgGuard reference from org.CanManageBilling to canEditSubscription

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
2023-04-14 11:14:18 +01:00
Larry Sussman
019aaf214b [PS-2175] Rename Billing Sync Key in View Billing Sync Token modal (#5002)
* fix: renamed to billing sync token

* Use translated string

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>

---------

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
2023-04-06 08:05:34 -05:00
Vincent Salucci
576d85b268 [AC-1202] Update enums filenames for admin-console/billing teams (#5169)
* refactor: add barrel file for admin-console enums, update references, refs AC-1202

* fix: lint/prettier updates, refs AC-1202

* refactor: add enum suffix, refs AC-1202

* refactor: add barrel file for billing enums, update imports to use it, refs AC-1202

* fix: prettier, refs AC-1202

* refactor: add enum suffix for billing enums, refs AC-1202
2023-04-05 20:34:23 -05:00
Vincent Salucci
bacb8828de [AC-1266] Enums filename conventions (#5140)
* refactor: update clientType enum

* refactor: update deviceType filename

* refactor: update encryptedExportType filename

* refactor: update encryptionType filename

* refactor: update eventType filename

* refactor: update fieldType filename

* refactor: update fileUploadType filename

* refactor: update hashPurpose filename

* refactor: update htmlStorageLocation filename

* refactor: update kdfType filename

* refactor: update keySuffixOptions filename

* refactor: update linkedIdType filename

* refactor: update logLevelType filename

* refactor: update nativeMessagingVersion filename

* refactor: update notificationType filename

* refactor: update productType filename

* refactor: update secureNoteType filename

* refactor: update stateVersion filename

* refactor: update storageLocation filename

* refactor: update themeType filename

* refactor: update uriMatchType filename

* fix: update kdfType classes missed in initial pass, refs AC-1266

* fix: missing import update for device-type

* refactor: add barrel file for enums and update pathed import statements, refs AC-1266

* fix: incorrect import statements for web, refs AC-1266

* fix: missed import statement updates (browser), refs AC-1266

* fix: missed import statement changes (cli), refs AC-1266

* fix: missed import statement changes (desktop), refs AC-1266

* fix: prettier, refs AC-1266

* refactor: (libs) update relative paths to use barrel file, refs AC-1266

* fix: missed find/replace import statements for SecureNoteType, refs AC-1266

* refactor: apply .enum suffix to enums folder and modify leftover relative paths, refs AC-1266

* fix: find/replace errors for native-messaging-version, refs AC-1266
2023-04-04 22:42:21 -05:00
Vincent Salucci
50556619d9 refactor: move sm enroll component to billing, refs AC-1202 (#5108) 2023-03-29 13:17:47 -05:00
Vincent Salucci
5008acfd13 fix: update downstream imports for org-api-key.request file move, refs AC-1202 2023-03-28 14:28:58 -05:00
Andreas Coroiu
7e905d518b [AC-471] Cloud update subscription page (#4897)
* [AC-471] feat: update copy

* [AC-471] feat: change text color when expired

* [AC-471] feat: remove charge amount
2023-03-24 09:39:22 +01:00