From 4f724974e9efd4d5fdda534919a7bef9d331a7d1 Mon Sep 17 00:00:00 2001 From: Alec Rippberger <127791530+alec-livefront@users.noreply.github.com> Date: Thu, 13 Mar 2025 12:23:37 -0500 Subject: [PATCH] refactor(auth): [PM-9725] remove deprecated EnvironmentComponent and self-hosted setup modal * Remove EnvironmentComponent * Cleanup unused translation messages Closes PM-9725 --- apps/browser/src/_locales/en/messages.json | 15 --- .../src/auth/popup/environment.component.html | 122 ------------------ .../src/auth/popup/environment.component.ts | 55 -------- apps/browser/src/popup/app-routing.module.ts | 7 - apps/browser/src/popup/app.module.ts | 2 - apps/desktop/src/app/app.module.ts | 2 - .../src/auth/environment.component.html | 103 --------------- .../desktop/src/auth/environment.component.ts | 24 ---- apps/desktop/src/locales/en/messages.json | 6 - .../auth/components/environment.component.ts | 82 ------------ 10 files changed, 418 deletions(-) delete mode 100644 apps/browser/src/auth/popup/environment.component.html delete mode 100644 apps/browser/src/auth/popup/environment.component.ts delete mode 100644 apps/desktop/src/auth/environment.component.html delete mode 100644 apps/desktop/src/auth/environment.component.ts delete mode 100644 libs/angular/src/auth/components/environment.component.ts diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index abbe2840d6f..9959357d850 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -1518,9 +1518,6 @@ "selfHostedEnvironment": { "message": "Self-hosted environment" }, - "selfHostedEnvironmentFooter": { - "message": "Specify the base URL of your on-premises hosted Bitwarden installation." - }, "selfHostedBaseUrlHint": { "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com" }, @@ -1533,9 +1530,6 @@ "customEnvironment": { "message": "Custom environment" }, - "customEnvironmentFooter": { - "message": "For advanced users. You can specify the base URL of each service independently." - }, "baseUrl": { "message": "Server URL" }, @@ -3278,15 +3272,6 @@ } } }, - "settingsEdited": { - "message": "Settings have been edited" - }, - "environmentEditedClick": { - "message": "Click here" - }, - "environmentEditedReset": { - "message": "to reset to pre-configured settings" - }, "serverVersion": { "message": "Server version" }, diff --git a/apps/browser/src/auth/popup/environment.component.html b/apps/browser/src/auth/popup/environment.component.html deleted file mode 100644 index 21e69fbbc39..00000000000 --- a/apps/browser/src/auth/popup/environment.component.html +++ /dev/null @@ -1,122 +0,0 @@ -
-
-
- -
-

- {{ "appName" | i18n }} -

-
- -
-
-
- - - {{ "environmentEditedClick" | i18n }} - - {{ "environmentEditedReset" | i18n }} - - -
-

- {{ "selfHostedEnvironment" | i18n }} -

-
-
- - -
-
- -
-
-

- {{ "customEnvironment" | i18n }} -

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
diff --git a/apps/browser/src/auth/popup/environment.component.ts b/apps/browser/src/auth/popup/environment.component.ts deleted file mode 100644 index c922c61b7e8..00000000000 --- a/apps/browser/src/auth/popup/environment.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -// FIXME: Update this file to be type safe and remove this and next line -// @ts-strict-ignore -import { Component, OnInit } from "@angular/core"; -import { Router } from "@angular/router"; - -import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/auth/components/environment.component"; -import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { ToastService } from "@bitwarden/components"; - -import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service"; - -@Component({ - selector: "app-environment", - templateUrl: "environment.component.html", -}) -export class EnvironmentComponent extends BaseEnvironmentComponent implements OnInit { - showEditedManagedSettings = false; - - constructor( - platformUtilsService: PlatformUtilsService, - public environmentService: BrowserEnvironmentService, - i18nService: I18nService, - private router: Router, - modalService: ModalService, - toastService: ToastService, - ) { - super(platformUtilsService, environmentService, i18nService, modalService, toastService); - this.showCustom = true; - } - - async ngOnInit() { - this.showEditedManagedSettings = await this.environmentService.settingsHaveChanged(); - } - - async resetEnvironment() { - const urls = await this.environmentService.getManagedEnvironment(); - - this.baseUrl = urls.base; - this.webVaultUrl = urls.webVault; - this.apiUrl = urls.api; - this.iconsUrl = urls.icons; - this.identityUrl = urls.identity; - this.notificationsUrl = urls.notifications; - this.iconsUrl = urls.icons; - } - - saved() { - super.saved(); - // 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([""]); - } -} diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index b33940a68d2..e73f56fa2f6 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -52,7 +52,6 @@ import { import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard"; import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component"; -import { EnvironmentComponent } from "../auth/popup/environment.component"; import { ExtensionAnonLayoutWrapperComponent, ExtensionAnonLayoutWrapperData, @@ -226,12 +225,6 @@ const routes: Routes = [ canActivate: [authGuard], data: { elevation: 1 } satisfies RouteDataProperties, }, - { - path: "environment", - component: EnvironmentComponent, - canActivate: [unauthGuardFn(unauthRouteOverrides)], - data: { elevation: 1 } satisfies RouteDataProperties, - }, { path: "view-cipher", component: ViewV2Component, diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index 248f10214f1..1fa6e8e3d89 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -19,7 +19,6 @@ import { AvatarModule, ButtonModule, FormFieldModule, ToastModule } from "@bitwa import { AccountComponent } from "../auth/popup/account-switching/account.component"; import { CurrentAccountComponent } from "../auth/popup/account-switching/current-account.component"; -import { EnvironmentComponent } from "../auth/popup/environment.component"; import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component"; import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component"; import { RemovePasswordComponent } from "../auth/popup/remove-password.component"; @@ -92,7 +91,6 @@ import "../platform/popup/locales"; AppComponent, ColorPasswordPipe, ColorPasswordCountPipe, - EnvironmentComponent, LoginDecryptionOptionsComponentV1, SetPasswordComponent, SsoComponentV1, diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index dbb4ddeb031..b1b2864af5a 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -12,7 +12,6 @@ import { DecryptionFailureDialogComponent } from "@bitwarden/vault"; import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; import { DeleteAccountComponent } from "../auth/delete-account.component"; -import { EnvironmentComponent } from "../auth/environment.component"; import { LoginModule } from "../auth/login/login.module"; import { RemovePasswordComponent } from "../auth/remove-password.component"; import { SetPasswordComponent } from "../auth/set-password.component"; @@ -70,7 +69,6 @@ import { SharedModule } from "./shared/shared.module"; CollectionsComponent, ColorPasswordPipe, ColorPasswordCountPipe, - EnvironmentComponent, FolderAddEditComponent, HeaderComponent, PasswordHistoryComponent, diff --git a/apps/desktop/src/auth/environment.component.html b/apps/desktop/src/auth/environment.component.html deleted file mode 100644 index 7819348fb99..00000000000 --- a/apps/desktop/src/auth/environment.component.html +++ /dev/null @@ -1,103 +0,0 @@ - diff --git a/apps/desktop/src/auth/environment.component.ts b/apps/desktop/src/auth/environment.component.ts deleted file mode 100644 index d24e0f86abe..00000000000 --- a/apps/desktop/src/auth/environment.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component } from "@angular/core"; - -import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/auth/components/environment.component"; -import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { ToastService } from "@bitwarden/components"; - -@Component({ - selector: "app-environment", - templateUrl: "environment.component.html", -}) -export class EnvironmentComponent extends BaseEnvironmentComponent { - constructor( - platformUtilsService: PlatformUtilsService, - environmentService: EnvironmentService, - i18nService: I18nService, - modalService: ModalService, - toastService: ToastService, - ) { - super(platformUtilsService, environmentService, i18nService, modalService, toastService); - } -} diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index 92fe91d962c..52e277beb23 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -945,9 +945,6 @@ "selfHostedEnvironment": { "message": "Self-hosted environment" }, - "selfHostedEnvironmentFooter": { - "message": "Specify the base URL of your on-premises hosted Bitwarden installation." - }, "selfHostedBaseUrlHint": { "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com" }, @@ -960,9 +957,6 @@ "customEnvironment": { "message": "Custom environment" }, - "customEnvironmentFooter": { - "message": "For advanced users. You can specify the base URL of each service independently." - }, "baseUrl": { "message": "Server URL" }, diff --git a/libs/angular/src/auth/components/environment.component.ts b/libs/angular/src/auth/components/environment.component.ts deleted file mode 100644 index 315eb756574..00000000000 --- a/libs/angular/src/auth/components/environment.component.ts +++ /dev/null @@ -1,82 +0,0 @@ -// FIXME: Update this file to be type safe and remove this and next line -// @ts-strict-ignore -import { Directive, EventEmitter, Output } from "@angular/core"; -import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; - -import { - EnvironmentService, - Region, -} from "@bitwarden/common/platform/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { ToastService } from "@bitwarden/components"; - -import { ModalService } from "../../services/modal.service"; - -@Directive() -export class EnvironmentComponent { - @Output() onSaved = new EventEmitter(); - - iconsUrl: string; - identityUrl: string; - apiUrl: string; - webVaultUrl: string; - notificationsUrl: string; - baseUrl: string; - showCustom = false; - - constructor( - protected platformUtilsService: PlatformUtilsService, - protected environmentService: EnvironmentService, - protected i18nService: I18nService, - private modalService: ModalService, - private toastService: ToastService, - ) { - this.environmentService.environment$.pipe(takeUntilDestroyed()).subscribe((env) => { - if (env.getRegion() !== Region.SelfHosted) { - this.baseUrl = ""; - this.webVaultUrl = ""; - this.apiUrl = ""; - this.identityUrl = ""; - this.iconsUrl = ""; - this.notificationsUrl = ""; - return; - } - - const urls = env.getUrls(); - this.baseUrl = urls.base || ""; - this.webVaultUrl = urls.webVault || ""; - this.apiUrl = urls.api || ""; - this.identityUrl = urls.identity || ""; - this.iconsUrl = urls.icons || ""; - this.notificationsUrl = urls.notifications || ""; - }); - } - - async submit() { - await this.environmentService.setEnvironment(Region.SelfHosted, { - base: this.baseUrl, - api: this.apiUrl, - identity: this.identityUrl, - webVault: this.webVaultUrl, - icons: this.iconsUrl, - notifications: this.notificationsUrl, - }); - - this.toastService.showToast({ - variant: "success", - title: null, - message: this.i18nService.t("environmentSaved"), - }); - this.saved(); - } - - toggleCustom() { - this.showCustom = !this.showCustom; - } - - protected saved() { - this.onSaved.emit(); - this.modalService.closeAll(); - } -}