mirror of
https://github.com/bitwarden/clients.git
synced 2026-02-05 00:25:18 +08:00
* feat(change-password-component): Change Password Update [18720] - Very close to complete. * fix(policy-enforcement): [PM-21085] Fix Bug with Policy Enforcement - Removed temp code to force the state I need to verify correctness. * fix(policy-enforcement): [PM-21085] Fix Bug with Policy Enforcement - Recover account working with change password component. * fix(policy-enforcement): [PM-21085] Fix Bug with Policy Enforcement - Made code more dry. * fix(change-password-component): Change Password Update [18720] - Updates to routing and the extension. Extension is still a wip. * fix(change-password-component): Change Password Update [18720] - Extension routing changes. * feat(change-password-component): Change Password Update [18720] - More extension work * feat(change-password-component): Change Password Update [18720] - Pausing work for now while we wait for product to hear back. * feat(change-password-component): Change Password Update [18720] - Removed duplicated anon layouts. * feat(change-password-component): Change Password Update [18720] - Tidied up code. * feat(change-password-component): Change Password Update [18720] - Small fixes to the styling * feat(change-password-component): Change Password Update [18720] - Adding more content for the routing. * feat(change-password-component): Change Password Update [18720] - Removed circular loop for now. * feat(change-password-component): Change Password Update [18720] - Made comments regarding the change password routing complexities with change-password and auth guard. * feat(change-password-component): Change Password Update [18720] - Undid some changes because they will be conflicts later on. * feat(change-password-component): Change Password Update [18720] - Small directive change. * feat(change-password-component): Change Password Update [18720] - Small changes and added some clarification on where I'm blocked * feat(change-password-component): Change Password Update [18720] - Org invite is seemingly working, found one bug to iron out. * refactor(change-password-component): Change Password Update [18720] - Fixed up policy service to be made more clear. * docs(change-password-component): Change Password Update [18720] - Updated documentation. * refactor(change-password-component): Change Password Update [18720] - Routing changes and policy service changes. * fix(change-password-component): Change Password Update [18720] - Wrapping up changes. * feat(change-password-component): Change Password Update [18720] - Should be working fully * feat(change-password-component): Change Password Update [18720] - Found a bug, working on password policy being present on login. * feat(change-password-component): Change Password Update [18720] - Turned on auth guard on other clients for change-password route. * feat(change-password-component): Change Password Update [18720] - Committing intermediate changes. * feat(change-password-component): Change Password Update [18720] - The master password policy endpoint has been added! Should be working. Testing now. * feat(change-password-component): Change Password Update [18720] - Minor fixes. * feat(change-password-component): Change Password Update [18720] - Undid naming change. * feat(change-password-component): Change Password Update [18720] - Removed comment. * feat(change-password-component): Change Password Update [18720] - Removed unneeded code. * fix(change-password-component): Change Password Update [18720] - Took org invite state out of service and made it accessible. * fix(change-password-component): Change Password Update [18720] - Small changes. * fix(change-password-component): Change Password Update [18720] - Split up org invite service into client specific implementations and have them injected into clients properly * feat(change-password-component): Change Password Update [18720] - Stopping work and going to switch to a new branch to pare down some of the solutions that were made to get this over the finish line * feat(change-password-component): Change Password Update [18720] - Started to remove functionality in the login.component and the password login strategy. * feat(change-password-component): Change Password Update [18720] - Removed more unneded changes. * feat(change-password-component): Change Password Update [18720] - Change password clearing state working properly. * fix(change-password-component): Change Password Update [18720] - Added docs and moved web implementation. * comments(change-password-component): Change Password Update [18720] - Added more notes. * test(change-password-component): Change Password Update [18720] - Added in tests for policy service. * comment(change-password-component): Change Password Update [18720] - Updated doc with correct ticket number. * comment(change-password-component): Change Password Update [18720] - Fixed doc. * test(change-password-component): Change Password Update [18720] - Fixed tests. * test(change-password-component): Change Password Update [18720] - Fixed linting errors. Have more tests to fix. * test(change-password-component): Change Password Update [18720] - Added back in ignore for typesafety. * fix(change-password-component): Change Password Update [18720] - Fixed other type issues. * test(change-password-component): Change Password Update [18720] - Fixed tests. * test(change-password-component): Change Password Update [18720] - Fixed more tests. * test(change-password-component): Change Password Update [18720] - Fixed tiny duplicate code. * fix(change-password-component): Change Password Update [18720] - Fixed desktop component. * fix(change-password-component): Change Password Update [18720] - Removed unused code * fix(change-password-component): Change Password Update [18720] - Fixed locales. * fix(change-password-component): Change Password Update [18720] - Removed tracing. * fix(change-password-component): Change Password Update [18720] - Removed duplicative services module entry. * fix(change-password-component): Change Password Update [18720] - Added comment. * fix(change-password-component): Change Password Update [18720] - Fixed unneeded call in two factor to get user id. * fix(change-password-component): Change Password Update [18720] - Fixed a couple of tiny things. * fix(change-password-component): Change Password Update [18720] - Added comment for later fix. * fix(change-password-component): Change Password Update [18720] - Fixed linting error. * PM-18720 - AuthGuard - move call to get isChangePasswordFlagOn down after other conditions for efficiency. * PM-18720 - PasswordLoginStrategy tests - test new feature flagged combine org invite policies logic for weak password evaluation. * PM-18720 - CLI - fix dep issue * PM-18720 - ChangePasswordComp - extract change password warning up out of input password component * PM-18720 - InputPassword - remove unused dependency. * PM-18720 - ChangePasswordComp - add callout dep * PM-18720 - Revert all anon-layout changes * PM-18720 - Anon Layout - finish reverting changes. * PM-18720 - WIP move of change password out of libs/auth * PM-18720 - Clean up remaining imports from moving change password out of libs/auth * PM-18720 - Add change-password barrel file for better import grouping * PM-18720 - Change Password comp - restore maxWidth * PM-18720 - After merge, fix errors * PM-18720 - Desktop - fix api service import * PM-18720 - NDV - fix routing. * PM-18720 - Change Password Comp - add logout service todo * PM-18720 - PasswordSettings - per feedback, component is already feature flagged behind PM16117_ChangeExistingPasswordRefactor so we can just delete the replaced callout (new text is in change-password comp) * PM-18720 - Routing Modules - properly flag new component behind feature flag. * PM-18720 - SSO Login Strategy - fix config service import since it is now in shared deps from main merge. * PM-18720 - Fix SSO login strategy tests * PM-18720 - Default Policy Service - address AC PR feedback --------- Co-authored-by: Jared Snider <jsnider@bitwarden.com> Co-authored-by: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
131 lines
5.2 KiB
TypeScript
131 lines
5.2 KiB
TypeScript
// FIXME: Update this file to be type safe and remove this and next line
|
|
// @ts-strict-ignore
|
|
import { inject } from "@angular/core";
|
|
import {
|
|
ActivatedRouteSnapshot,
|
|
CanActivateFn,
|
|
Router,
|
|
RouterStateSnapshot,
|
|
UrlTree,
|
|
} from "@angular/router";
|
|
import { firstValueFrom } from "rxjs";
|
|
|
|
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
|
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
|
|
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
|
|
import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
|
|
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
|
|
import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
|
|
import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
|
|
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
|
|
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
|
|
|
export const authGuard: CanActivateFn = async (
|
|
route: ActivatedRouteSnapshot,
|
|
routerState: RouterStateSnapshot,
|
|
): Promise<boolean | UrlTree> => {
|
|
const authService = inject(AuthService);
|
|
const router = inject(Router);
|
|
const messagingService = inject(MessagingService);
|
|
const keyConnectorService = inject(KeyConnectorService);
|
|
const accountService = inject(AccountService);
|
|
const masterPasswordService = inject(MasterPasswordServiceAbstraction);
|
|
const configService = inject(ConfigService);
|
|
|
|
const authStatus = await authService.getAuthStatus();
|
|
|
|
if (authStatus === AuthenticationStatus.LoggedOut) {
|
|
messagingService.send("authBlocked", { url: routerState.url });
|
|
return false;
|
|
}
|
|
|
|
const userId = (await firstValueFrom(accountService.activeAccount$)).id;
|
|
const forceSetPasswordReason = await firstValueFrom(
|
|
masterPasswordService.forceSetPasswordReason$(userId),
|
|
);
|
|
|
|
const isSetInitialPasswordFlagOn = await configService.getFeatureFlag(
|
|
FeatureFlag.PM16117_SetInitialPasswordRefactor,
|
|
);
|
|
|
|
// User JIT provisioned into a master-password-encryption org
|
|
if (
|
|
authStatus === AuthenticationStatus.Locked &&
|
|
forceSetPasswordReason === ForceSetPasswordReason.SsoNewJitProvisionedUser &&
|
|
!routerState.url.includes("set-initial-password") &&
|
|
isSetInitialPasswordFlagOn
|
|
) {
|
|
return router.createUrlTree(["/set-initial-password"]);
|
|
}
|
|
|
|
// TDE Offboarding on untrusted device
|
|
if (
|
|
authStatus === AuthenticationStatus.Locked &&
|
|
forceSetPasswordReason === ForceSetPasswordReason.TdeOffboardingUntrustedDevice &&
|
|
!routerState.url.includes("set-initial-password") &&
|
|
isSetInitialPasswordFlagOn
|
|
) {
|
|
return router.createUrlTree(["/set-initial-password"]);
|
|
}
|
|
|
|
// We must add exemptions for the SsoNewJitProvisionedUser and TdeOffboardingUntrustedDevice scenarios as
|
|
// the "set-initial-password" route is guarded by the authGuard.
|
|
if (
|
|
authStatus === AuthenticationStatus.Locked &&
|
|
forceSetPasswordReason !== ForceSetPasswordReason.SsoNewJitProvisionedUser &&
|
|
forceSetPasswordReason !== ForceSetPasswordReason.TdeOffboardingUntrustedDevice
|
|
) {
|
|
if (routerState != null) {
|
|
messagingService.send("lockedUrl", { url: routerState.url });
|
|
}
|
|
// TODO PM-9674: when extension refresh is finished, remove promptBiometric
|
|
// as it has been integrated into the component as a default feature.
|
|
return router.createUrlTree(["lock"], { queryParams: { promptBiometric: true } });
|
|
}
|
|
|
|
if (
|
|
!routerState.url.includes("remove-password") &&
|
|
(await firstValueFrom(keyConnectorService.convertAccountRequired$))
|
|
) {
|
|
return router.createUrlTree(["/remove-password"]);
|
|
}
|
|
|
|
// TDE org user has "manage account recovery" permission
|
|
if (
|
|
forceSetPasswordReason ===
|
|
ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission &&
|
|
!routerState.url.includes("set-password") &&
|
|
!routerState.url.includes("set-initial-password")
|
|
) {
|
|
const route = isSetInitialPasswordFlagOn ? "/set-initial-password" : "/set-password";
|
|
return router.createUrlTree([route]);
|
|
}
|
|
|
|
// TDE Offboarding on trusted device
|
|
if (
|
|
forceSetPasswordReason === ForceSetPasswordReason.TdeOffboarding &&
|
|
!routerState.url.includes("update-temp-password") &&
|
|
!routerState.url.includes("set-initial-password")
|
|
) {
|
|
const route = isSetInitialPasswordFlagOn ? "/set-initial-password" : "/update-temp-password";
|
|
return router.createUrlTree([route]);
|
|
}
|
|
|
|
const isChangePasswordFlagOn = await configService.getFeatureFlag(
|
|
FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
|
|
);
|
|
|
|
// Post- Account Recovery or Weak Password on login
|
|
if (
|
|
(forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset ||
|
|
forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword) &&
|
|
!routerState.url.includes("update-temp-password") &&
|
|
!routerState.url.includes("change-password")
|
|
) {
|
|
const route = isChangePasswordFlagOn ? "/change-password" : "/update-temp-password";
|
|
return router.createUrlTree([route]);
|
|
}
|
|
|
|
return true;
|
|
};
|