bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

PM-2593 Update Premium Urls to target cloudWebVaultUrl (#5861)

Browse Source 
* updated urls in premium web component and premium libs to use the cloudwebvaulturl
* moved premium.component in web from base settings to a new settings folder inside vault
This commit is contained in:
Jason Ng
2023-08-09 14:10:01 -04:00
committed by GitHub
parent a7cce1a3ad
commit 96c6b870cb
7 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/billing/settings/subscription-routing.module.ts
View File

@@ -4,7 +4,7 @@ import { RouterModule, Routes } from "@angular/router";
import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component";
import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component";
import { PremiumComponent } from "../../settings/premium.component";
import { PremiumComponent } from "../../vault/settings/premium.component";
import { SubscriptionComponent } from "./subscription.component";

2
apps/web/src/app/shared/loose-components.module.ts
View File

@@ -81,7 +81,6 @@ import { DeleteAccountComponent } from "../settings/delete-account.component";
import { DomainRulesComponent } from "../settings/domain-rules.component";
import { LowKdfComponent } from "../settings/low-kdf.component";
import { PreferencesComponent } from "../settings/preferences.component";
import { PremiumComponent } from "../settings/premium.component";
import { ProfileComponent } from "../settings/profile.component";
import { PurgeVaultComponent } from "../settings/purge-vault.component";
import { SecurityKeysComponent } from "../settings/security-keys.component";
@@ -107,6 +106,7 @@ import { ShareComponent } from "../vault/individual-vault/share.component";
import { AddEditComponent as OrgAddEditComponent } from "../vault/org-vault/add-edit.component";
import { AttachmentsComponent as OrgAttachmentsComponent } from "../vault/org-vault/attachments.component";
import { CollectionsComponent as OrgCollectionsComponent } from "../vault/org-vault/collections.component";
import { PremiumComponent } from "../vault/settings/premium.component";
import { EnvironmentSelectorModule } from "./../components/environment-selector/environment-selector.module";
import { AccountFingerprintComponent } from "./components/account-fingerprint/account-fingerprint.component";

2
apps/web/src/app/settings/premium.component.html → apps/web/src/app/vault/settings/premium.component.html
View File

@@ -54,7 +54,7 @@
</p>
<a
bitButton
href="https://vault.bitwarden.com/#/settings/premium"
href="{{ this.cloudWebVaultUrl }}/#/settings/premium"
target="_blank"
rel="noopener"
buttonType="secondary"

10
apps/web/src/app/settings/premium.component.ts → apps/web/src/app/vault/settings/premium.component.ts
View File

@@ -3,6 +3,7 @@ import { Router } from "@angular/router";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -10,8 +11,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { PaymentComponent } from "../billing/settings/payment.component";
import { TaxInfoComponent } from "../billing/settings/tax-info.component";
import { PaymentComponent } from "../../billing/settings/payment.component";
import { TaxInfoComponent } from "../../billing/settings/tax-info.component";
@Component({
selector: "app-premium",
@@ -27,6 +28,7 @@ export class PremiumComponent implements OnInit {
familyPlanMaxUserCount = 6;
storageGbPrice = 4;
additionalStorage = 0;
cloudWebVaultUrl: string;
formPromise: Promise<any>;
@@ -39,9 +41,11 @@ export class PremiumComponent implements OnInit {
private messagingService: MessagingService,
private syncService: SyncService,
private logService: LogService,
private stateService: StateService
private stateService: StateService,
private environmentService: EnvironmentService
) {
this.selfHosted = platformUtilsService.isSelfHost();
this.cloudWebVaultUrl = this.environmentService.getCloudWebVaultUrl();
}
async ngOnInit() {