From 88dc574982069b7eac9002e5c2adeefaea54a813 Mon Sep 17 00:00:00 2001 From: Bitwarden DevOps <106330231+bitwarden-devops-bot@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:54:20 -0400 Subject: [PATCH 1/9] Bumped client version(s) (#9596) --- apps/desktop/package.json | 2 +- apps/desktop/src/package-lock.json | 4 ++-- apps/desktop/src/package.json | 2 +- package-lock.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 129e9c43f09..4bb0a94961e 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@bitwarden/desktop", "description": "A secure and free password manager for all of your devices.", - "version": "2024.6.0", + "version": "2024.6.1", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json index 34a4dc99f65..c29ec0a9eea 100644 --- a/apps/desktop/src/package-lock.json +++ b/apps/desktop/src/package-lock.json @@ -1,12 +1,12 @@ { "name": "@bitwarden/desktop", - "version": "2024.6.0", + "version": "2024.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@bitwarden/desktop", - "version": "2024.6.0", + "version": "2024.6.1", "license": "GPL-3.0", "dependencies": { "@bitwarden/desktop-native": "file:../desktop_native", diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json index 3a629f37cb0..04406eea1d4 100644 --- a/apps/desktop/src/package.json +++ b/apps/desktop/src/package.json @@ -2,7 +2,7 @@ "name": "@bitwarden/desktop", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "2024.6.0", + "version": "2024.6.1", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", diff --git a/package-lock.json b/package-lock.json index fec3db2aea0..cf734e25a39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -237,7 +237,7 @@ }, "apps/desktop": { "name": "@bitwarden/desktop", - "version": "2024.6.0", + "version": "2024.6.1", "hasInstallScript": true, "license": "GPL-3.0" }, From d5e0ab74a4a61ad3cad551f5965014de24801be1 Mon Sep 17 00:00:00 2001 From: KiruthigaManivannan <162679756+KiruthigaManivannan@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:37:08 +0530 Subject: [PATCH 2/9] PM-1943 Migrate Recover Delete Component (#9169) * PM-1943 Migrate Recover Delete Component * PM-1943 Anon layout changes done * PM-1943 - await navigate * PM-1943 - Add new anon layout wrapper env selector. --------- Co-authored-by: Jared Snider --- .../app/auth/recover-delete.component.html | 56 +++++-------------- .../src/app/auth/recover-delete.component.ts | 38 ++++++------- apps/web/src/app/oss-routing.module.ts | 20 +++++-- 3 files changed, 44 insertions(+), 70 deletions(-) diff --git a/apps/web/src/app/auth/recover-delete.component.html b/apps/web/src/app/auth/recover-delete.component.html index 5b3ba90565e..a00fbb838eb 100644 --- a/apps/web/src/app/auth/recover-delete.component.html +++ b/apps/web/src/app/auth/recover-delete.component.html @@ -1,44 +1,16 @@ -
-
-
-

{{ "deleteAccount" | i18n }}

-
-
-

{{ "deleteRecoverDesc" | i18n }}

-
- - -
-
-
- - - {{ "cancel" | i18n }} - -
-
-
-
+ +

{{ "deleteRecoverDesc" | i18n }}

+ + {{ "emailAddress" | i18n }} + + +
+
+ + + {{ "cancel" | i18n }} +
diff --git a/apps/web/src/app/auth/recover-delete.component.ts b/apps/web/src/app/auth/recover-delete.component.ts index e52353e382c..6688c1582ec 100644 --- a/apps/web/src/app/auth/recover-delete.component.ts +++ b/apps/web/src/app/auth/recover-delete.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; import { Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { DeleteRecoverRequest } from "@bitwarden/common/models/request/delete-recover.request"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ @@ -12,33 +12,27 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl templateUrl: "recover-delete.component.html", }) export class RecoverDeleteComponent { - email: string; - formPromise: Promise; + protected recoverDeleteForm = new FormGroup({ + email: new FormControl(null, [Validators.required]), + }); constructor( private router: Router, private apiService: ApiService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private logService: LogService, ) {} - async submit() { - try { - const request = new DeleteRecoverRequest(); - request.email = this.email.trim().toLowerCase(); - this.formPromise = this.apiService.postAccountRecoverDelete(request); - await this.formPromise; - this.platformUtilsService.showToast( - "success", - null, - this.i18nService.t("deleteRecoverEmailSent"), - ); - // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. - // eslint-disable-next-line @typescript-eslint/no-floating-promises - this.router.navigate(["/"]); - } catch (e) { - this.logService.error(e); - } - } + submit = async () => { + const request = new DeleteRecoverRequest(); + request.email = this.recoverDeleteForm.value.email.trim().toLowerCase(); + await this.apiService.postAccountRecoverDelete(request); + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("deleteRecoverEmailSent"), + ); + + await this.router.navigate(["/"]); + }; } diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 209a291a712..0a15e058696 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -134,12 +134,6 @@ const routes: Routes = [ data: { titleId: "acceptFamilySponsorship", doNotSaveUrl: false } satisfies DataProperties, }, { path: "recover", pathMatch: "full", redirectTo: "recover-2fa" }, - { - path: "recover-delete", - component: RecoverDeleteComponent, - canActivate: [UnauthGuard], - data: { titleId: "deleteAccount" } satisfies DataProperties, - }, { path: "verify-recover-delete", component: VerifyRecoverDeleteComponent, @@ -231,6 +225,20 @@ const routes: Routes = [ (mod) => mod.AcceptEmergencyComponent, ), }, + ], + }, + { + path: "recover-delete", + canActivate: [unauthGuardFn()], + children: [ + { + path: "", + component: RecoverDeleteComponent, + data: { + pageTitle: "deleteAccount", + titleId: "deleteAccount", + } satisfies DataProperties & AnonLayoutWrapperData, + }, { path: "", component: EnvironmentSelectorComponent, From ae688d9e9eb78d1d0171a75812ff100aa0bcde9e Mon Sep 17 00:00:00 2001 From: vinith-kovan <156108204+vinith-kovan@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:59:44 +0530 Subject: [PATCH 3/9] [PM-4961]anon-layout login component migrated (#9167) * anaon-layout login component migrated * Login component migration * Login component migration --------- Co-authored-by: Ike Kottlowski --- .../src/app/auth/login/login.component.html | 239 ++++++++---------- .../web/src/app/auth/login/login.component.ts | 7 +- apps/web/src/app/oss-routing.module.ts | 19 +- 3 files changed, 127 insertions(+), 138 deletions(-) diff --git a/apps/web/src/app/auth/login/login.component.html b/apps/web/src/app/auth/login/login.component.html index 0e29a342786..eb2a9a88aa1 100644 --- a/apps/web/src/app/auth/login/login.component.html +++ b/apps/web/src/app/auth/login/login.component.html @@ -1,155 +1,122 @@
-
-
- -

- {{ "loginOrCreateNewAccount" | i18n }} -

-
+
+ + {{ "emailAddress" | i18n }} + + +
+ +
+ + + {{ "rememberEmail" | i18n }} + +
+ +
+ +
-
- - - {{ "rememberEmail" | i18n }} - -
+
+

{{ "or" | i18n }}

-
- -
+ + {{ "loginWithPasskey" | i18n }} + +
-
-

{{ "or" | i18n }}

+
- - {{ "loginWithPasskey" | i18n }} - -
+

+ {{ "newAroundHere" | i18n }} + + {{ "createAccount" | i18n }} +

+ -
+
+
+ + {{ "masterPass" | i18n }} + + + + {{ "getMasterPasswordHint" | i18n }} +
-

- {{ "newAroundHere" | i18n }} - - {{ "createAccount" | i18n }} -

- +
+ +
-
-
- - {{ "masterPass" | i18n }} - - - - {{ "getMasterPasswordHint" | i18n }} -
+
+ +
-
- -
+
+ +
-
- -
+
+ + + {{ "enterpriseSingleSignOn" | i18n }} + +
-
- -
+
-
- - - {{ "enterpriseSingleSignOn" | i18n }} - -
- -
- -
-

{{ "loggingInAs" | i18n }} {{ loggedEmail }}

- {{ "notYou" | i18n }} -
-
-
+
+

{{ "loggingInAs" | i18n }} {{ loggedEmail }}

+ {{ "notYou" | i18n }}
diff --git a/apps/web/src/app/auth/login/login.component.ts b/apps/web/src/app/auth/login/login.component.ts index 51d46f46a42..1f174b7397a 100644 --- a/apps/web/src/app/auth/login/login.component.ts +++ b/apps/web/src/app/auth/login/login.component.ts @@ -43,7 +43,6 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions; policies: Policy[]; showPasswordless = false; - constructor( private acceptOrganizationInviteService: AcceptOrganizationInviteService, devicesApiService: DevicesApiServiceAbstraction, @@ -92,7 +91,13 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { this.onSuccessfulLoginNavigate = this.goAfterLogIn; this.showPasswordless = flagEnabled("showPasswordless"); } + submitForm = async (showToast = true) => { + return await this.submitFormHelper(showToast); + }; + private async submitFormHelper(showToast: boolean) { + await super.submit(showToast); + } async ngOnInit() { // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe this.route.queryParams.pipe(first()).subscribe(async (qParams) => { diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 0a15e058696..eed8b7d281c 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -66,7 +66,6 @@ const routes: Routes = [ children: [], // Children lets us have an empty component. canActivate: [redirectGuard()], // Redirects either to vault, login, or lock page. }, - { path: "login", component: LoginComponent, canActivate: [UnauthGuard] }, { path: "login-with-device", component: LoginViaAuthRequestComponent, @@ -182,6 +181,24 @@ const routes: Routes = [ path: "", component: AnonLayoutWrapperComponent, children: [ + { + path: "login", + canActivate: [unauthGuardFn()], + children: [ + { + path: "", + component: LoginComponent, + }, + { + path: "", + component: EnvironmentSelectorComponent, + outlet: "environment-selector", + }, + ], + data: { + pageTitle: "logIn", + }, + }, { path: "2fa", component: TwoFactorComponent, From c726b91c1f8538b0114f9be6c9ea9da57319390f Mon Sep 17 00:00:00 2001 From: KiruthigaManivannan <162679756+KiruthigaManivannan@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:34:43 +0530 Subject: [PATCH 4/9] AC-2409 Migrate Accept Provider Component (#9390) * AC-2409 Migrate Accept Provider Component * AC-2409 Replaced the loading scenario --- .../manage/accept-provider.component.html | 67 +++++++++---------- .../providers/providers-routing.module.ts | 12 +++- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html index a5927cbc9ab..d8e6f030418 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html @@ -1,46 +1,41 @@ -
+
- -

+ +

- {{ "loading" | i18n }} + {{ "loading" | i18n }}

-
-
-
-

{{ "joinProvider" | i18n }}

-
-
-

- {{ providerName }} - {{ email }} -

-

{{ "joinProviderDesc" | i18n }}

-
-
- - {{ "logIn" | i18n }} - - - {{ "createAccount" | i18n }} - -
-
-
-
+
+

+ {{ providerName }} + {{ email }} +

+

{{ "joinProviderDesc" | i18n }}

+
+
+ + {{ "logIn" | i18n }} + + + {{ "createAccount" | i18n }} +
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts index 1f03ece9075..9a2859fcbfe 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; +import { AnonLayoutWrapperComponent } from "@bitwarden/auth/angular"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { ProvidersComponent } from "@bitwarden/web-vault/app/admin-console/providers/providers.component"; import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component"; @@ -48,10 +49,19 @@ const routes: Routes = [ component: SetupProviderComponent, data: { titleId: "setupProvider" }, }, + ], + }, + { + path: "", + component: AnonLayoutWrapperComponent, + children: [ { path: "accept-provider", component: AcceptProviderComponent, - data: { titleId: "acceptProvider" }, + data: { + pageTitle: "joinProvider", + titleId: "acceptProvider", + }, }, ], }, From dd5d01283e7bd259f682d2aadb23930538ed41ac Mon Sep 17 00:00:00 2001 From: KiruthigaManivannan <162679756+KiruthigaManivannan@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:46:58 +0530 Subject: [PATCH 5/9] PM-4954 Migrate SSO Component (#9126) * PM-4954 Migrate SSO Component * PM-4954 Updated anon layout changes * PM-4954 Updated oss routing module * PM-4954 Addressed review comments * PM-4954 - SSO Comp - adjust to use form control accessor. * PM-4954 - SsoComp - update form control accessor to use type safe approach. * PM-4954 - Move canActivate up a level * PM-4954 - Consolidate route under AnonLayoutWrapperComponent path after merging in main. --------- Co-authored-by: Jared Snider Co-authored-by: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com> --- apps/web/src/app/auth/sso.component.html | 68 +++++++----------------- apps/web/src/app/auth/sso.component.ts | 24 ++++++--- apps/web/src/app/oss-routing.module.ts | 25 ++++++--- 3 files changed, 54 insertions(+), 63 deletions(-) diff --git a/apps/web/src/app/auth/sso.component.html b/apps/web/src/app/auth/sso.component.html index fb56cead245..59abc92e872 100644 --- a/apps/web/src/app/auth/sso.component.html +++ b/apps/web/src/app/auth/sso.component.html @@ -1,52 +1,22 @@ -
-
-
- -
-
- - {{ "loading" | i18n }} -
-
-

{{ "ssoLogInWithOrgIdentifier" | i18n }}

-
- - -
-
-
- - - {{ "cancel" | i18n }} - -
-
-
+ +
+ + {{ "loading" | i18n }} +
+
+

{{ "ssoLogInWithOrgIdentifier" | i18n }}

+ + {{ "ssoIdentifier" | i18n }} + + +
+
+ + + {{ "cancel" | i18n }} +
diff --git a/apps/web/src/app/auth/sso.component.ts b/apps/web/src/app/auth/sso.component.ts index e120b2749f1..2b8f20ed424 100644 --- a/apps/web/src/app/auth/sso.component.ts +++ b/apps/web/src/app/auth/sso.component.ts @@ -1,4 +1,5 @@ import { Component } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; @@ -31,6 +32,14 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/ge }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class SsoComponent extends BaseSsoComponent { + protected formGroup = new FormGroup({ + identifier: new FormControl(null, [Validators.required]), + }); + + get identifierFormControl() { + return this.formGroup.controls.identifier; + } + constructor( ssoLoginService: SsoLoginServiceAbstraction, loginStrategyService: LoginStrategyServiceAbstraction, @@ -82,7 +91,7 @@ export class SsoComponent extends BaseSsoComponent { this.route.queryParams.pipe(first()).subscribe(async (qParams) => { if (qParams.identifier != null) { // SSO Org Identifier in query params takes precedence over claimed domains - this.identifier = qParams.identifier; + this.identifierFormControl.setValue(qParams.identifier); } else { // Note: this flow is written for web but both browser and desktop // redirect here on SSO button click. @@ -96,7 +105,7 @@ export class SsoComponent extends BaseSsoComponent { await this.orgDomainApiService.getClaimedOrgDomainByEmail(qParams.email); if (response?.ssoAvailable) { - this.identifier = response.organizationIdentifier; + this.identifierFormControl.setValue(response.organizationIdentifier); await this.submit(); return; } @@ -110,7 +119,7 @@ export class SsoComponent extends BaseSsoComponent { // Fallback to state svc if domain is unclaimed const storedIdentifier = await this.ssoLoginService.getOrganizationSsoIdentifier(); if (storedIdentifier != null) { - this.identifier = storedIdentifier; + this.identifierFormControl.setValue(storedIdentifier); } } }); @@ -131,13 +140,12 @@ export class SsoComponent extends BaseSsoComponent { } } - async submit() { + submit = async () => { + this.identifier = this.identifierFormControl.value; await this.ssoLoginService.setOrganizationSsoIdentifier(this.identifier); if (this.clientId === "browser") { document.cookie = `ssoHandOffMessage=${this.i18nService.t("ssoHandOff")};SameSite=strict`; } - // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. - // eslint-disable-next-line @typescript-eslint/no-floating-promises - super.submit(); - } + await Object.getPrototypeOf(this).submit.call(this); + }; } diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index eed8b7d281c..46930f92c94 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -97,12 +97,6 @@ const routes: Routes = [ redirectTo: "register", pathMatch: "full", }, - { - path: "sso", - component: SsoComponent, - canActivate: [UnauthGuard], - data: { titleId: "enterpriseSingleSignOn" } satisfies DataProperties, - }, { path: "set-password", component: SetPasswordComponent, @@ -181,6 +175,25 @@ const routes: Routes = [ path: "", component: AnonLayoutWrapperComponent, children: [ + { + path: "sso", + canActivate: [unauthGuardFn()], + children: [ + { + path: "", + component: SsoComponent, + data: { + pageTitle: "enterpriseSingleSignOn", + titleId: "enterpriseSingleSignOn", + } satisfies DataProperties & AnonLayoutWrapperData, + }, + { + path: "", + component: EnvironmentSelectorComponent, + outlet: "environment-selector", + }, + ], + }, { path: "login", canActivate: [unauthGuardFn()], From 623310075468b28820a44522d5fa4949cda83d1e Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:06:02 -0400 Subject: [PATCH 6/9] Remove Bump CLI Formula workflow (#9601) --- .github/workflows/brew-bump-cli.yml | 41 ----------------------------- 1 file changed, 41 deletions(-) delete mode 100644 .github/workflows/brew-bump-cli.yml diff --git a/.github/workflows/brew-bump-cli.yml b/.github/workflows/brew-bump-cli.yml deleted file mode 100644 index 33c6b7c368e..00000000000 --- a/.github/workflows/brew-bump-cli.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -name: Bump CLI Formula - -on: - push: - tags: - - cli-v** - workflow_dispatch: - -defaults: - run: - shell: bash - -jobs: - update-desktop-cask: - name: Update Bitwarden CLI Formula - runs-on: macos-13 - steps: - - name: Login to Azure - uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 - with: - creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} - - - name: Retrieve secrets - id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@main - with: - keyvault: "bitwarden-ci" - secrets: "brew-bump-workflow-pat" - - - name: Update Homebrew formula - uses: dawidd6/action-homebrew-bump-formula@baf2b60c51fc1f8453c884b0c61052668a71bd1d # v3.11.0 - with: - # Required, custom GitHub access token with the 'public_repo' and 'workflow' scopes - token: ${{ steps.retrieve-secrets.outputs.brew-bump-workflow-pat }} - org: bitwarden - tap: Homebrew/homebrew-core - formula: bitwarden-cli - tag: ${{ github.ref }} - revision: ${{ github.sha }} - force: true From a7912ad10ca1a2a11f2acba4cd86f32e2e5bed72 Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:22:46 -0400 Subject: [PATCH 7/9] Revert "Upload license dialog not closing bug fix (#9588)" (#9602) This reverts commit bece0720863b875bb999c9477afab23c8f85f22b. --- .../shared/update-license-dialog.component.ts | 11 +----- .../shared/update-license.component.ts | 36 +++++++++---------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.ts b/apps/web/src/app/billing/shared/update-license-dialog.component.ts index 7338bb7aa6e..5f9a1e94bef 100644 --- a/apps/web/src/app/billing/shared/update-license-dialog.component.ts +++ b/apps/web/src/app/billing/shared/update-license-dialog.component.ts @@ -1,4 +1,3 @@ -import { DialogRef } from "@angular/cdk/dialog"; import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; @@ -24,16 +23,8 @@ export class UpdateLicenseDialogComponent extends UpdateLicenseComponent { platformUtilsService: PlatformUtilsService, organizationApiService: OrganizationApiServiceAbstraction, formBuilder: FormBuilder, - dialogRef: DialogRef, // Add this line ) { - super( - apiService, - i18nService, - platformUtilsService, - organizationApiService, - formBuilder, - dialogRef, - ); + super(apiService, i18nService, platformUtilsService, organizationApiService, formBuilder); } async submitLicense() { await this.submit(); diff --git a/apps/web/src/app/billing/shared/update-license.component.ts b/apps/web/src/app/billing/shared/update-license.component.ts index 14ee8df680b..30b5983090b 100644 --- a/apps/web/src/app/billing/shared/update-license.component.ts +++ b/apps/web/src/app/billing/shared/update-license.component.ts @@ -1,4 +1,3 @@ -import { DialogRef } from "@angular/cdk/dialog"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; @@ -7,7 +6,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { UpdateLicenseDialogResult } from "./update-license-dialog.component"; @Component({ selector: "app-update-license", templateUrl: "update-license.component.html", @@ -30,7 +28,6 @@ export class UpdateLicenseComponent { private platformUtilsService: PlatformUtilsService, private organizationApiService: OrganizationApiServiceAbstraction, private formBuilder: FormBuilder, - private dialogRef: DialogRef, ) {} protected setSelectedFile(event: Event) { const fileInputEl = event.target; @@ -54,25 +51,24 @@ export class UpdateLicenseComponent { const fd = new FormData(); fd.append("license", files); - // let updatePromise: Promise = null; - // if (this.organizationId == null) { - // updatePromise = this.apiService.postAccountLicense(fd); - // } else { - // updatePromise = this.organizationApiService.updateLicense(this.organizationId, fd); - // } + let updatePromise: Promise = null; + if (this.organizationId == null) { + updatePromise = this.apiService.postAccountLicense(fd); + } else { + updatePromise = this.organizationApiService.updateLicense(this.organizationId, fd); + } - // this.formPromise = updatePromise.then(() => { - // return this.apiService.refreshIdentityToken(); - // }); + this.formPromise = updatePromise.then(() => { + return this.apiService.refreshIdentityToken(); + }); - // await this.formPromise; - // this.platformUtilsService.showToast( - // "success", - // null, - // this.i18nService.t("licenseUploadSuccess"), - // ); - // this.onUpdated.emit(); - this.dialogRef.close(UpdateLicenseDialogResult.Updated); + await this.formPromise; + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("licenseUploadSuccess"), + ); + this.onUpdated.emit(); }; cancel = () => { From c1d3659a2865b2f9f96d22c982bf7108a19d3b6c Mon Sep 17 00:00:00 2001 From: Jake Fink Date: Wed, 12 Jun 2024 11:50:23 -0400 Subject: [PATCH 8/9] initialize subscription after setting initial values (#9579) --- .../settings/account-security.component.ts | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts index 32cfbe416d1..10c9b2fb98d 100644 --- a/apps/browser/src/auth/popup/settings/account-security.component.ts +++ b/apps/browser/src/auth/popup/settings/account-security.component.ts @@ -10,6 +10,7 @@ import { map, Observable, pairwise, + startWith, Subject, switchMap, takeUntil, @@ -150,8 +151,25 @@ export class AccountSecurityComponent implements OnInit { timeout = VaultTimeoutStringType.OnRestart; } + const initialValues = { + vaultTimeout: timeout, + vaultTimeoutAction: await firstValueFrom( + this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(activeAccount.id), + ), + pin: await this.pinService.isPinSet(activeAccount.id), + biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(), + enableAutoBiometricsPrompt: await firstValueFrom( + this.biometricStateService.promptAutomatically$, + ), + }; + this.form.patchValue(initialValues, { emitEvent: false }); + + this.supportsBiometric = await this.platformUtilsService.supportsBiometric(); + this.showChangeMasterPass = await this.userVerificationService.hasMasterPassword(); + this.form.controls.vaultTimeout.valueChanges .pipe( + startWith(initialValues.vaultTimeout), // emit to init pairwise pairwise(), concatMap(async ([previousValue, newValue]) => { await this.saveVaultTimeout(previousValue, newValue); @@ -162,6 +180,7 @@ export class AccountSecurityComponent implements OnInit { this.form.controls.vaultTimeoutAction.valueChanges .pipe( + startWith(initialValues.vaultTimeoutAction), // emit to init pairwise pairwise(), concatMap(async ([previousValue, newValue]) => { await this.saveVaultTimeoutAction(previousValue, newValue); @@ -170,24 +189,6 @@ export class AccountSecurityComponent implements OnInit { ) .subscribe(); - const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id; - - const initialValues = { - vaultTimeout: timeout, - vaultTimeoutAction: await firstValueFrom( - this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(activeAccount.id), - ), - pin: await this.pinService.isPinSet(userId), - biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(), - enableAutoBiometricsPrompt: await firstValueFrom( - this.biometricStateService.promptAutomatically$, - ), - }; - this.form.patchValue(initialValues); // Emit event to initialize `pairwise` operator - - this.supportsBiometric = await this.platformUtilsService.supportsBiometric(); - this.showChangeMasterPass = await this.userVerificationService.hasMasterPassword(); - this.form.controls.pin.valueChanges .pipe( concatMap(async (value) => { From 4d278240645d68cbbed620e4a6b68bd160d8e73b Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:04:48 -0400 Subject: [PATCH 9/9] Revert "[PM-5024] tax info component migration (#8199)" (#9603) This reverts commit 99dc88688a09cbea8eeee26b9b95e78e6377c5c5. --- .../trial-billing-step.component.ts | 4 - .../billing/individual/premium.component.ts | 4 - .../organization-plans.component.ts | 3 - .../shared/adjust-payment-dialog.component.ts | 3 - .../billing/shared/tax-info.component.html | 414 +++++++++++++--- .../app/billing/shared/tax-info.component.ts | 468 +++--------------- 6 files changed, 419 insertions(+), 477 deletions(-) diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts index dea74f364f8..bd138cad292 100644 --- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts +++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts @@ -87,10 +87,6 @@ export class TrialBillingStepComponent implements OnInit { } async submit(): Promise { - if (!this.taxInfoComponent.taxFormGroup.valid) { - this.taxInfoComponent.taxFormGroup.markAllAsTouched(); - } - this.formPromise = this.createOrganization(); const organizationId = await this.formPromise; diff --git a/apps/web/src/app/billing/individual/premium.component.ts b/apps/web/src/app/billing/individual/premium.component.ts index 9449e5cd251..79a8bad75ae 100644 --- a/apps/web/src/app/billing/individual/premium.component.ts +++ b/apps/web/src/app/billing/individual/premium.component.ts @@ -64,11 +64,7 @@ export class PremiumComponent implements OnInit { return; } } - submit = async () => { - if (!this.taxInfoComponent.taxFormGroup.valid) { - this.taxInfoComponent.taxFormGroup.markAllAsTouched(); - } this.licenseForm.markAllAsTouched(); this.addonForm.markAllAsTouched(); if (this.selfHosted) { diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts index bc49c1c33b3..2228ad9f3ad 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -547,9 +547,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { } submit = async () => { - if (!this.taxComponent.taxFormGroup.valid) { - this.taxComponent.taxFormGroup.markAllAsTouched(); - } if (this.singleOrgPolicyBlock) { return; } diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts index 3a850982cf8..8f16daeaa7b 100644 --- a/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts +++ b/apps/web/src/app/billing/shared/adjust-payment-dialog.component.ts @@ -55,9 +55,6 @@ export class AdjustPaymentDialogComponent { } submit = async () => { - if (!this.taxInfoComponent.taxFormGroup.valid) { - this.taxInfoComponent.taxFormGroup.markAllAsTouched(); - } const request = new PaymentRequest(); const response = this.paymentComponent.createPaymentToken().then((result) => { request.paymentToken = result[0]; diff --git a/apps/web/src/app/billing/shared/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html index c254ffa4a4d..30cca550d37 100644 --- a/apps/web/src/app/billing/shared/tax-info.component.html +++ b/apps/web/src/app/billing/shared/tax-info.component.html @@ -1,63 +1,363 @@ -
-
-
- - {{ "country" | i18n }} - - - - -
-
- - {{ "zipPostalCode" | i18n }} - - -
-
- - - {{ "includeVAT" | i18n }} - +
+
+
+ +
-
-
- - {{ "taxIdNumber" | i18n }} - - +
+
+ +
-
-
- - {{ "address1" | i18n }} - - -
-
- - {{ "address2" | i18n }} - - -
-
- - {{ "cityTown" | i18n }} - - -
-
- - {{ "stateProvince" | i18n }} - - +
+
+ +
- +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts index f50a82d6edf..a704c86eb51 100644 --- a/apps/web/src/app/billing/shared/tax-info.component.ts +++ b/apps/web/src/app/billing/shared/tax-info.component.ts @@ -1,7 +1,5 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { FormControl, FormGroup, Validators } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { Subject, takeUntil } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @@ -17,11 +15,6 @@ type TaxInfoView = Omit & { includeTaxId: boolean; [key: string]: unknown; }; -type CountryList = { - name: string; - value: string; - disabled: boolean; -}; @Component({ selector: "app-tax-info", @@ -33,18 +26,6 @@ type CountryList = { export class TaxInfoComponent { @Input() trialFlow = false; @Output() onCountryChanged = new EventEmitter(); - private destroy$ = new Subject(); - - taxFormGroup = new FormGroup({ - country: new FormControl(null, [Validators.required]), - postalCode: new FormControl(null), - includeTaxId: new FormControl(null), - taxId: new FormControl(null), - line1: new FormControl(null), - line2: new FormControl(null), - city: new FormControl(null), - state: new FormControl(null), - }); loading = true; organizationId: string; @@ -59,261 +40,20 @@ export class TaxInfoComponent { country: "US", includeTaxId: false, }; - countryList: CountryList[] = [ - { name: "-- Select --", value: "", disabled: false }, - { name: "United States", value: "US", disabled: false }, - { name: "China", value: "CN", disabled: false }, - { name: "France", value: "FR", disabled: false }, - { name: "Germany", value: "DE", disabled: false }, - { name: "Canada", value: "CA", disabled: false }, - { name: "United Kingdom", value: "GB", disabled: false }, - { name: "Australia", value: "AU", disabled: false }, - { name: "India", value: "IN", disabled: false }, - { name: "", value: "-", disabled: true }, - { name: "Afghanistan", value: "AF", disabled: false }, - { name: "Åland Islands", value: "AX", disabled: false }, - { name: "Albania", value: "AL", disabled: false }, - { name: "Algeria", value: "DZ", disabled: false }, - { name: "American Samoa", value: "AS", disabled: false }, - { name: "Andorra", value: "AD", disabled: false }, - { name: "Angola", value: "AO", disabled: false }, - { name: "Anguilla", value: "AI", disabled: false }, - { name: "Antarctica", value: "AQ", disabled: false }, - { name: "Antigua and Barbuda", value: "AG", disabled: false }, - { name: "Argentina", value: "AR", disabled: false }, - { name: "Armenia", value: "AM", disabled: false }, - { name: "Aruba", value: "AW", disabled: false }, - { name: "Austria", value: "AT", disabled: false }, - { name: "Azerbaijan", value: "AZ", disabled: false }, - { name: "Bahamas", value: "BS", disabled: false }, - { name: "Bahrain", value: "BH", disabled: false }, - { name: "Bangladesh", value: "BD", disabled: false }, - { name: "Barbados", value: "BB", disabled: false }, - { name: "Belarus", value: "BY", disabled: false }, - { name: "Belgium", value: "BE", disabled: false }, - { name: "Belize", value: "BZ", disabled: false }, - { name: "Benin", value: "BJ", disabled: false }, - { name: "Bermuda", value: "BM", disabled: false }, - { name: "Bhutan", value: "BT", disabled: false }, - { name: "Bolivia, Plurinational State of", value: "BO", disabled: false }, - { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false }, - { name: "Bosnia and Herzegovina", value: "BA", disabled: false }, - { name: "Botswana", value: "BW", disabled: false }, - { name: "Bouvet Island", value: "BV", disabled: false }, - { name: "Brazil", value: "BR", disabled: false }, - { name: "British Indian Ocean Territory", value: "IO", disabled: false }, - { name: "Brunei Darussalam", value: "BN", disabled: false }, - { name: "Bulgaria", value: "BG", disabled: false }, - { name: "Burkina Faso", value: "BF", disabled: false }, - { name: "Burundi", value: "BI", disabled: false }, - { name: "Cambodia", value: "KH", disabled: false }, - { name: "Cameroon", value: "CM", disabled: false }, - { name: "Cape Verde", value: "CV", disabled: false }, - { name: "Cayman Islands", value: "KY", disabled: false }, - { name: "Central African Republic", value: "CF", disabled: false }, - { name: "Chad", value: "TD", disabled: false }, - { name: "Chile", value: "CL", disabled: false }, - { name: "Christmas Island", value: "CX", disabled: false }, - { name: "Cocos (Keeling) Islands", value: "CC", disabled: false }, - { name: "Colombia", value: "CO", disabled: false }, - { name: "Comoros", value: "KM", disabled: false }, - { name: "Congo", value: "CG", disabled: false }, - { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false }, - { name: "Cook Islands", value: "CK", disabled: false }, - { name: "Costa Rica", value: "CR", disabled: false }, - { name: "Côte d'Ivoire", value: "CI", disabled: false }, - { name: "Croatia", value: "HR", disabled: false }, - { name: "Cuba", value: "CU", disabled: false }, - { name: "Curaçao", value: "CW", disabled: false }, - { name: "Cyprus", value: "CY", disabled: false }, - { name: "Czech Republic", value: "CZ", disabled: false }, - { name: "Denmark", value: "DK", disabled: false }, - { name: "Djibouti", value: "DJ", disabled: false }, - { name: "Dominica", value: "DM", disabled: false }, - { name: "Dominican Republic", value: "DO", disabled: false }, - { name: "Ecuador", value: "EC", disabled: false }, - { name: "Egypt", value: "EG", disabled: false }, - { name: "El Salvador", value: "SV", disabled: false }, - { name: "Equatorial Guinea", value: "GQ", disabled: false }, - { name: "Eritrea", value: "ER", disabled: false }, - { name: "Estonia", value: "EE", disabled: false }, - { name: "Ethiopia", value: "ET", disabled: false }, - { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false }, - { name: "Faroe Islands", value: "FO", disabled: false }, - { name: "Fiji", value: "FJ", disabled: false }, - { name: "Finland", value: "FI", disabled: false }, - { name: "French Guiana", value: "GF", disabled: false }, - { name: "French Polynesia", value: "PF", disabled: false }, - { name: "French Southern Territories", value: "TF", disabled: false }, - { name: "Gabon", value: "GA", disabled: false }, - { name: "Gambia", value: "GM", disabled: false }, - { name: "Georgia", value: "GE", disabled: false }, - { name: "Ghana", value: "GH", disabled: false }, - { name: "Gibraltar", value: "GI", disabled: false }, - { name: "Greece", value: "GR", disabled: false }, - { name: "Greenland", value: "GL", disabled: false }, - { name: "Grenada", value: "GD", disabled: false }, - { name: "Guadeloupe", value: "GP", disabled: false }, - { name: "Guam", value: "GU", disabled: false }, - { name: "Guatemala", value: "GT", disabled: false }, - { name: "Guernsey", value: "GG", disabled: false }, - { name: "Guinea", value: "GN", disabled: false }, - { name: "Guinea-Bissau", value: "GW", disabled: false }, - { name: "Guyana", value: "GY", disabled: false }, - { name: "Haiti", value: "HT", disabled: false }, - { name: "Heard Island and McDonald Islands", value: "HM", disabled: false }, - { name: "Holy See (Vatican City State)", value: "VA", disabled: false }, - { name: "Honduras", value: "HN", disabled: false }, - { name: "Hong Kong", value: "HK", disabled: false }, - { name: "Hungary", value: "HU", disabled: false }, - { name: "Iceland", value: "IS", disabled: false }, - { name: "Indonesia", value: "ID", disabled: false }, - { name: "Iran, Islamic Republic of", value: "IR", disabled: false }, - { name: "Iraq", value: "IQ", disabled: false }, - { name: "Ireland", value: "IE", disabled: false }, - { name: "Isle of Man", value: "IM", disabled: false }, - { name: "Israel", value: "IL", disabled: false }, - { name: "Italy", value: "IT", disabled: false }, - { name: "Jamaica", value: "JM", disabled: false }, - { name: "Japan", value: "JP", disabled: false }, - { name: "Jersey", value: "JE", disabled: false }, - { name: "Jordan", value: "JO", disabled: false }, - { name: "Kazakhstan", value: "KZ", disabled: false }, - { name: "Kenya", value: "KE", disabled: false }, - { name: "Kiribati", value: "KI", disabled: false }, - { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false }, - { name: "Korea, Republic of", value: "KR", disabled: false }, - { name: "Kuwait", value: "KW", disabled: false }, - { name: "Kyrgyzstan", value: "KG", disabled: false }, - { name: "Lao People's Democratic Republic", value: "LA", disabled: false }, - { name: "Latvia", value: "LV", disabled: false }, - { name: "Lebanon", value: "LB", disabled: false }, - { name: "Lesotho", value: "LS", disabled: false }, - { name: "Liberia", value: "LR", disabled: false }, - { name: "Libya", value: "LY", disabled: false }, - { name: "Liechtenstein", value: "LI", disabled: false }, - { name: "Lithuania", value: "LT", disabled: false }, - { name: "Luxembourg", value: "LU", disabled: false }, - { name: "Macao", value: "MO", disabled: false }, - { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false }, - { name: "Madagascar", value: "MG", disabled: false }, - { name: "Malawi", value: "MW", disabled: false }, - { name: "Malaysia", value: "MY", disabled: false }, - { name: "Maldives", value: "MV", disabled: false }, - { name: "Mali", value: "ML", disabled: false }, - { name: "Malta", value: "MT", disabled: false }, - { name: "Marshall Islands", value: "MH", disabled: false }, - { name: "Martinique", value: "MQ", disabled: false }, - { name: "Mauritania", value: "MR", disabled: false }, - { name: "Mauritius", value: "MU", disabled: false }, - { name: "Mayotte", value: "YT", disabled: false }, - { name: "Mexico", value: "MX", disabled: false }, - { name: "Micronesia, Federated States of", value: "FM", disabled: false }, - { name: "Moldova, Republic of", value: "MD", disabled: false }, - { name: "Monaco", value: "MC", disabled: false }, - { name: "Mongolia", value: "MN", disabled: false }, - { name: "Montenegro", value: "ME", disabled: false }, - { name: "Montserrat", value: "MS", disabled: false }, - { name: "Morocco", value: "MA", disabled: false }, - { name: "Mozambique", value: "MZ", disabled: false }, - { name: "Myanmar", value: "MM", disabled: false }, - { name: "Namibia", value: "NA", disabled: false }, - { name: "Nauru", value: "NR", disabled: false }, - { name: "Nepal", value: "NP", disabled: false }, - { name: "Netherlands", value: "NL", disabled: false }, - { name: "New Caledonia", value: "NC", disabled: false }, - { name: "New Zealand", value: "NZ", disabled: false }, - { name: "Nicaragua", value: "NI", disabled: false }, - { name: "Niger", value: "NE", disabled: false }, - { name: "Nigeria", value: "NG", disabled: false }, - { name: "Niue", value: "NU", disabled: false }, - { name: "Norfolk Island", value: "NF", disabled: false }, - { name: "Northern Mariana Islands", value: "MP", disabled: false }, - { name: "Norway", value: "NO", disabled: false }, - { name: "Oman", value: "OM", disabled: false }, - { name: "Pakistan", value: "PK", disabled: false }, - { name: "Palau", value: "PW", disabled: false }, - { name: "Palestinian Territory, Occupied", value: "PS", disabled: false }, - { name: "Panama", value: "PA", disabled: false }, - { name: "Papua New Guinea", value: "PG", disabled: false }, - { name: "Paraguay", value: "PY", disabled: false }, - { name: "Peru", value: "PE", disabled: false }, - { name: "Philippines", value: "PH", disabled: false }, - { name: "Pitcairn", value: "PN", disabled: false }, - { name: "Poland", value: "PL", disabled: false }, - { name: "Portugal", value: "PT", disabled: false }, - { name: "Puerto Rico", value: "PR", disabled: false }, - { name: "Qatar", value: "QA", disabled: false }, - { name: "Réunion", value: "RE", disabled: false }, - { name: "Romania", value: "RO", disabled: false }, - { name: "Russian Federation", value: "RU", disabled: false }, - { name: "Rwanda", value: "RW", disabled: false }, - { name: "Saint Barthélemy", value: "BL", disabled: false }, - { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false }, - { name: "Saint Kitts and Nevis", value: "KN", disabled: false }, - { name: "Saint Lucia", value: "LC", disabled: false }, - { name: "Saint Martin (French part)", value: "MF", disabled: false }, - { name: "Saint Pierre and Miquelon", value: "PM", disabled: false }, - { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false }, - { name: "Samoa", value: "WS", disabled: false }, - { name: "San Marino", value: "SM", disabled: false }, - { name: "Sao Tome and Principe", value: "ST", disabled: false }, - { name: "Saudi Arabia", value: "SA", disabled: false }, - { name: "Senegal", value: "SN", disabled: false }, - { name: "Serbia", value: "RS", disabled: false }, - { name: "Seychelles", value: "SC", disabled: false }, - { name: "Sierra Leone", value: "SL", disabled: false }, - { name: "Singapore", value: "SG", disabled: false }, - { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false }, - { name: "Slovakia", value: "SK", disabled: false }, - { name: "Slovenia", value: "SI", disabled: false }, - { name: "Solomon Islands", value: "SB", disabled: false }, - { name: "Somalia", value: "SO", disabled: false }, - { name: "South Africa", value: "ZA", disabled: false }, - { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false }, - { name: "South Sudan", value: "SS", disabled: false }, - { name: "Spain", value: "ES", disabled: false }, - { name: "Sri Lanka", value: "LK", disabled: false }, - { name: "Sudan", value: "SD", disabled: false }, - { name: "Suriname", value: "SR", disabled: false }, - { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false }, - { name: "Swaziland", value: "SZ", disabled: false }, - { name: "Sweden", value: "SE", disabled: false }, - { name: "Switzerland", value: "CH", disabled: false }, - { name: "Syrian Arab Republic", value: "SY", disabled: false }, - { name: "Taiwan", value: "TW", disabled: false }, - { name: "Tajikistan", value: "TJ", disabled: false }, - { name: "Tanzania, United Republic of", value: "TZ", disabled: false }, - { name: "Thailand", value: "TH", disabled: false }, - { name: "Timor-Leste", value: "TL", disabled: false }, - { name: "Togo", value: "TG", disabled: false }, - { name: "Tokelau", value: "TK", disabled: false }, - { name: "Tonga", value: "TO", disabled: false }, - { name: "Trinidad and Tobago", value: "TT", disabled: false }, - { name: "Tunisia", value: "TN", disabled: false }, - { name: "Turkey", value: "TR", disabled: false }, - { name: "Turkmenistan", value: "TM", disabled: false }, - { name: "Turks and Caicos Islands", value: "TC", disabled: false }, - { name: "Tuvalu", value: "TV", disabled: false }, - { name: "Uganda", value: "UG", disabled: false }, - { name: "Ukraine", value: "UA", disabled: false }, - { name: "United Arab Emirates", value: "AE", disabled: false }, - { name: "United States Minor Outlying Islands", value: "UM", disabled: false }, - { name: "Uruguay", value: "UY", disabled: false }, - { name: "Uzbekistan", value: "UZ", disabled: false }, - { name: "Vanuatu", value: "VU", disabled: false }, - { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false }, - { name: "Viet Nam", value: "VN", disabled: false }, - { name: "Virgin Islands, British", value: "VG", disabled: false }, - { name: "Virgin Islands, U.S.", value: "VI", disabled: false }, - { name: "Wallis and Futuna", value: "WF", disabled: false }, - { name: "Western Sahara", value: "EH", disabled: false }, - { name: "Yemen", value: "YE", disabled: false }, - { name: "Zambia", value: "ZM", disabled: false }, - { name: "Zimbabwe", value: "ZW", disabled: false }, - ]; + taxRates: TaxRateResponse[]; + private pristine: TaxInfoView = { + taxId: null, + line1: null, + line2: null, + city: null, + state: null, + postalCode: null, + country: "US", + includeTaxId: false, + }; + constructor( private apiService: ApiService, private route: ActivatedRoute, @@ -321,70 +61,6 @@ export class TaxInfoComponent { private organizationApiService: OrganizationApiServiceAbstraction, ) {} - get country(): string { - return this.taxFormGroup.get("country").value; - } - - set country(country: string) { - this.taxFormGroup.get("country").setValue(country); - } - - get postalCode(): string { - return this.taxFormGroup.get("postalCode").value; - } - - set postalCode(postalCode: string) { - this.taxFormGroup.get("postalCode").setValue(postalCode); - } - - get includeTaxId(): boolean { - return this.taxFormGroup.get("includeTaxId").value; - } - - set includeTaxId(includeTaxId: boolean) { - this.taxFormGroup.get("includeTaxId").setValue(includeTaxId); - } - - get taxId(): string { - return this.taxFormGroup.get("taxId").value; - } - - set taxId(taxId: string) { - this.taxFormGroup.get("taxId").setValue(taxId); - } - - get line1(): string { - return this.taxFormGroup.get("line1").value; - } - - set line1(line1: string) { - this.taxFormGroup.get("line1").setValue(line1); - } - - get line2(): string { - return this.taxFormGroup.get("line2").value; - } - - set line2(line2: string) { - this.taxFormGroup.get("line2").setValue(line2); - } - - get city(): string { - return this.taxFormGroup.get("city").value; - } - - set city(city: string) { - this.taxFormGroup.get("city").setValue(city); - } - - get state(): string { - return this.taxFormGroup.get("state").value; - } - - set state(state: string) { - this.taxFormGroup.get("state").setValue(state); - } - async ngOnInit() { // Provider setup // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe @@ -399,22 +75,21 @@ export class TaxInfoComponent { try { const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId); if (taxInfo) { - this.taxId = taxInfo.taxId; - this.state = taxInfo.state; - this.line1 = taxInfo.line1; - this.line2 = taxInfo.line2; - this.city = taxInfo.city; - this.state = taxInfo.state; - this.postalCode = taxInfo.postalCode; - this.country = taxInfo.country || "US"; - this.includeTaxId = - this.countrySupportsTax(this.country) && + this.taxInfo.taxId = taxInfo.taxId; + this.taxInfo.state = taxInfo.state; + this.taxInfo.line1 = taxInfo.line1; + this.taxInfo.line2 = taxInfo.line2; + this.taxInfo.city = taxInfo.city; + this.taxInfo.state = taxInfo.state; + this.taxInfo.postalCode = taxInfo.postalCode; + this.taxInfo.country = taxInfo.country || "US"; + this.taxInfo.includeTaxId = + this.countrySupportsTax(this.taxInfo.country) && (!!taxInfo.taxId || !!taxInfo.line1 || !!taxInfo.line2 || !!taxInfo.city || !!taxInfo.state); - this.setTaxInfoObject(); } } catch (e) { this.logService.error(e); @@ -423,40 +98,20 @@ export class TaxInfoComponent { try { const taxInfo = await this.apiService.getTaxInfo(); if (taxInfo) { - this.postalCode = taxInfo.postalCode; - this.country = taxInfo.country || "US"; + this.taxInfo.postalCode = taxInfo.postalCode; + this.taxInfo.country = taxInfo.country || "US"; } - this.setTaxInfoObject(); } catch (e) { this.logService.error(e); } } - - if (this.country === "US") { - this.taxFormGroup.get("postalCode").setValidators([Validators.required]); - this.taxFormGroup.get("postalCode").updateValueAndValidity(); - } - + this.pristine = Object.assign({}, this.taxInfo); // If not the default (US) then trigger onCountryChanged - if (this.country !== "US") { + if (this.taxInfo.country !== "US") { this.onCountryChanged.emit(); } }); - this.taxFormGroup - .get("country") - .valueChanges.pipe(takeUntil(this.destroy$)) - .subscribe((value) => { - if (value === "US") { - this.taxFormGroup.get("postalCode").setValidators([Validators.required]); - } else { - this.taxFormGroup.get("postalCode").clearValidators(); - } - this.taxFormGroup.get("postalCode").updateValueAndValidity(); - this.setTaxInfoObject(); - this.changeCountry(); - }); - try { const taxRates = await this.apiService.getTaxRates(); if (taxRates) { @@ -472,27 +127,16 @@ export class TaxInfoComponent { get taxRate() { if (this.taxRates != null) { const localTaxRate = this.taxRates.find( - (x) => x.country === this.country && x.postalCode === this.postalCode, + (x) => x.country === this.taxInfo.country && x.postalCode === this.taxInfo.postalCode, ); return localTaxRate?.rate ?? null; } } - setTaxInfoObject() { - this.taxInfo.country = this.country; - this.taxInfo.postalCode = this.postalCode; - this.taxInfo.includeTaxId = this.includeTaxId; - this.taxInfo.taxId = this.taxId; - this.taxInfo.line1 = this.line1; - this.taxInfo.line2 = this.line2; - this.taxInfo.city = this.city; - this.taxInfo.state = this.state; - } - get showTaxIdCheckbox() { return ( (this.organizationId || this.providerId) && - this.country !== "US" && + this.taxInfo.country !== "US" && this.countrySupportsTax(this.taxInfo.country) ); } @@ -500,23 +144,23 @@ export class TaxInfoComponent { get showTaxIdFields() { return ( (this.organizationId || this.providerId) && - this.includeTaxId && - this.countrySupportsTax(this.country) + this.taxInfo.includeTaxId && + this.countrySupportsTax(this.taxInfo.country) ); } getTaxInfoRequest(): TaxInfoUpdateRequest { if (this.organizationId || this.providerId) { const request = new ExpandedTaxInfoUpdateRequest(); - request.country = this.country; - request.postalCode = this.postalCode; + request.country = this.taxInfo.country; + request.postalCode = this.taxInfo.postalCode; - if (this.includeTaxId) { - request.taxId = this.taxId; - request.line1 = this.line1; - request.line2 = this.line2; - request.city = this.city; - request.state = this.state; + if (this.taxInfo.includeTaxId) { + request.taxId = this.taxInfo.taxId; + request.line1 = this.taxInfo.line1; + request.line2 = this.taxInfo.line2; + request.city = this.taxInfo.city; + request.state = this.taxInfo.state; } else { request.taxId = null; request.line1 = null; @@ -527,15 +171,18 @@ export class TaxInfoComponent { return request; } else { const request = new TaxInfoUpdateRequest(); - request.postalCode = this.postalCode; - request.country = this.country; + request.postalCode = this.taxInfo.postalCode; + request.country = this.taxInfo.country; return request; } } submitTaxInfo(): Promise { - this.taxFormGroup.updateValueAndValidity(); - this.taxFormGroup.markAllAsTouched(); + if (!this.hasChanged()) { + return new Promise((resolve) => { + resolve(); + }); + } const request = this.getTaxInfoRequest(); return this.organizationId ? this.organizationApiService.updateTaxInfo( @@ -546,14 +193,13 @@ export class TaxInfoComponent { } changeCountry() { - if (!this.countrySupportsTax(this.country)) { - this.includeTaxId = false; - this.taxId = null; - this.line1 = null; - this.line2 = null; - this.city = null; - this.state = null; - this.setTaxInfoObject(); + if (!this.countrySupportsTax(this.taxInfo.country)) { + this.taxInfo.includeTaxId = false; + this.taxInfo.taxId = null; + this.taxInfo.line1 = null; + this.taxInfo.line2 = null; + this.taxInfo.city = null; + this.taxInfo.state = null; } this.onCountryChanged.emit(); } @@ -562,6 +208,16 @@ export class TaxInfoComponent { return this.taxSupportedCountryCodes.includes(countryCode); } + private hasChanged(): boolean { + for (const key in this.taxInfo) { + // eslint-disable-next-line + if (this.pristine.hasOwnProperty(key) && this.pristine[key] !== this.taxInfo[key]) { + return true; + } + } + return false; + } + private taxSupportedCountryCodes: string[] = [ "CN", "FR",