mirror of
https://github.com/bitwarden/browser.git
synced 2025-01-01 18:08:19 +01:00
/register does not redirect to /signup when email-verification flag is enabled (#12001)
* Manually route to signup page when the email verification feature flag is enabled
* Revert "Manually route to signup page when the email verification feature flag is enabled"
This reverts commit f3a2b412b9
.
* Do not show toast when redirecting to signup
This commit is contained in:
parent
e073c47c17
commit
234a832fc4
@ -112,7 +112,7 @@ const routes: Routes = [
|
||||
path: "register",
|
||||
component: TrialInitiationComponent,
|
||||
canActivate: [
|
||||
canAccessFeature(FeatureFlag.EmailVerification, false, "/signup"),
|
||||
canAccessFeature(FeatureFlag.EmailVerification, false, "/signup", false),
|
||||
unauthGuardFn(),
|
||||
],
|
||||
data: { titleId: "createAccount" } satisfies RouteDataProperties,
|
||||
|
@ -16,11 +16,13 @@ type FlagValue = boolean | number | string;
|
||||
* @param featureFlag - The feature flag to check
|
||||
* @param requiredFlagValue - Optional value to the feature flag must be equal to, defaults to true
|
||||
* @param redirectUrlOnDisabled - Optional url to redirect to if the feature flag is disabled
|
||||
* @param showToast - Optional boolean to show a toast if the feature flag is disabled - defaults to true
|
||||
*/
|
||||
export const canAccessFeature = (
|
||||
featureFlag: FeatureFlag,
|
||||
requiredFlagValue: FlagValue = true,
|
||||
redirectUrlOnDisabled?: string,
|
||||
showToast = true,
|
||||
): CanActivateFn => {
|
||||
return async () => {
|
||||
const configService = inject(ConfigService);
|
||||
@ -36,11 +38,13 @@ export const canAccessFeature = (
|
||||
return true;
|
||||
}
|
||||
|
||||
toastService.showToast({
|
||||
variant: "error",
|
||||
title: null,
|
||||
message: i18nService.t("accessDenied"),
|
||||
});
|
||||
if (showToast) {
|
||||
toastService.showToast({
|
||||
variant: "error",
|
||||
title: null,
|
||||
message: i18nService.t("accessDenied"),
|
||||
});
|
||||
}
|
||||
|
||||
if (redirectUrlOnDisabled != null) {
|
||||
return router.createUrlTree([redirectUrlOnDisabled]);
|
||||
|
Loading…
Reference in New Issue
Block a user