bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-10 12:33:26 +00:00
Code Issues Releases Wiki Activity

refactor getOrgPolicies call

Browse Source
This commit is contained in:
rr-bw
2024-08-27 16:21:08 -07:00
parent 688a24bd52
commit 97f9008b60
13 changed files with 49 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
apps/web/src/app/auth/core/services/login/web-login.service.ts
View File

@@ -8,7 +8,6 @@ import { InternalPolicyService } from "@bitwarden/common/admin-console/abstracti
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { OrganizationInvite } from "../../../../../../../../libs/auth/src/common/models/domain/organization-invite";
import { RouterService } from "../../../../core/router.service";
import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
@@ -23,44 +22,44 @@ export class WebLoginService extends DefaultLoginService implements LoginService
this.routerService.setPreviousUrl(route.toString());
}
async getOrganizationInvite(): Promise<OrganizationInvite | null> {
return await this.acceptOrganizationInviteService.getOrganizationInvite();
}
async getOrgPolicies(): Promise<PasswordPolicies | null> {
const orgInvite = await this.acceptOrganizationInviteService.getOrganizationInvite();
async getPasswordPolicies(invite: OrganizationInvite): Promise<PasswordPolicies> {
let policies: Policy[];
if (orgInvite != null) {
let policies: Policy[];
try {
policies = await this.policyApiService.getPoliciesByToken(
invite.organizationId,
invite.token,
invite.email,
invite.organizationUserId,
try {
policies = await this.policyApiService.getPoliciesByToken(
orgInvite.organizationId,
orgInvite.token,
orgInvite.email,
orgInvite.organizationUserId,
);
} catch (e) {
this.logService.error(e);
}
if (policies == null) {
return;
}
const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
policies,
orgInvite.organizationId,
);
} catch (e) {
this.logService.error(e);
const isPolicyAndAutoEnrollEnabled =
resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
const enforcedPasswordPolicyOptions = await firstValueFrom(
this.policyService.masterPasswordPolicyOptions$(policies),
);
return {
policies,
isPolicyAndAutoEnrollEnabled,
enforcedPasswordPolicyOptions,
};
}
if (policies == null) {
return;
}
const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
policies,
invite.organizationId,
);
const isPolicyAndAutoEnrollEnabled =
resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
const enforcedPasswordPolicyOptions = await firstValueFrom(
this.policyService.masterPasswordPolicyOptions$(policies),
);
return {
policies,
isPolicyAndAutoEnrollEnabled,
enforcedPasswordPolicyOptions,
};
}
}

2
apps/web/src/app/auth/core/services/registration/web-registration-finish.service.spec.ts
View File

@@ -15,8 +15,8 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/sym
import { CsprngArray } from "@bitwarden/common/types/csprng";
import { MasterKey, UserKey } from "@bitwarden/common/types/key";
import { OrganizationInvite } from "../../../../../../../../libs/auth/src/common/models/domain/organization-invite";
import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
import { OrganizationInvite } from "../../../organization-invite/organization-invite";
import { WebRegistrationFinishService } from "./web-registration-finish.service";