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

Resolve the vault page redirect issue (#14941)

Browse Source
This commit is contained in:
cyprain-okeke
2025-06-09 13:05:21 +01:00
committed by GitHub
parent b1f090e054
commit a421acc47a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
View File

@@ -87,6 +87,9 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
const state = this.router.getCurrentNavigation()?.extras?.state; const state = this.router.getCurrentNavigation()?.extras?.state;
// incase the above state is undefined or null we use redundantState // incase the above state is undefined or null we use redundantState
const redundantState: any = location.getState(); const redundantState: any = location.getState();
const queryParam = this.activatedRoute.snapshot.queryParamMap.get(
"launchPaymentModalAutomatically",
);
if (state && Object.prototype.hasOwnProperty.call(state, "launchPaymentModalAutomatically")) { if (state && Object.prototype.hasOwnProperty.call(state, "launchPaymentModalAutomatically")) {
this.launchPaymentModalAutomatically = state.launchPaymentModalAutomatically; this.launchPaymentModalAutomatically = state.launchPaymentModalAutomatically;
} else if ( } else if (
@@ -94,6 +97,8 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
Object.prototype.hasOwnProperty.call(redundantState, "launchPaymentModalAutomatically") Object.prototype.hasOwnProperty.call(redundantState, "launchPaymentModalAutomatically")
) { ) {
this.launchPaymentModalAutomatically = redundantState.launchPaymentModalAutomatically; this.launchPaymentModalAutomatically = redundantState.launchPaymentModalAutomatically;
} else if (queryParam === "true") {
this.launchPaymentModalAutomatically = true;
} else { } else {
this.launchPaymentModalAutomatically = false; this.launchPaymentModalAutomatically = false;
} }

1
apps/web/src/app/billing/services/trial-flow.service.ts
View File

@@ -133,6 +133,7 @@ export class TrialFlowService {
private async navigateToPaymentMethod(orgId: string) { private async navigateToPaymentMethod(orgId: string) {
await this.router.navigate(["organizations", `${orgId}`, "billing", "payment-method"], { await this.router.navigate(["organizations", `${orgId}`, "billing", "payment-method"], {
state: { launchPaymentModalAutomatically: true }, state: { launchPaymentModalAutomatically: true },
queryParams: { launchPaymentModalAutomatically: true },
}); });
} }