fill out webOnInit
This commit is contained in:
parent
fcf01fee74
commit
688a24bd52
|
@ -1,21 +1,66 @@
|
||||||
import { inject } from "@angular/core";
|
import { inject } from "@angular/core";
|
||||||
import { UrlTree } from "@angular/router";
|
import { UrlTree } from "@angular/router";
|
||||||
|
import { firstValueFrom } from "rxjs";
|
||||||
|
|
||||||
import { DefaultLoginService, LoginService } from "@bitwarden/auth/angular";
|
import { DefaultLoginService, LoginService, PasswordPolicies } from "@bitwarden/auth/angular";
|
||||||
|
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
|
||||||
|
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
||||||
|
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 { RouterService } from "../../../../core/router.service";
|
||||||
|
import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
|
||||||
|
|
||||||
export class WebLoginService extends DefaultLoginService implements LoginService {
|
export class WebLoginService extends DefaultLoginService implements LoginService {
|
||||||
|
acceptOrganizationInviteService = inject(AcceptOrganizationInviteService);
|
||||||
|
logService = inject(LogService);
|
||||||
|
policyApiService = inject(PolicyApiServiceAbstraction);
|
||||||
|
policyService = inject(InternalPolicyService);
|
||||||
routerService = inject(RouterService);
|
routerService = inject(RouterService);
|
||||||
|
|
||||||
setPreviousUrl(route: UrlTree): void | null {
|
setPreviousUrl(route: UrlTree): void | null {
|
||||||
this.routerService.setPreviousUrl(route.toString());
|
this.routerService.setPreviousUrl(route.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleExistingOrgInvite(): Promise<void | null> {
|
async getOrganizationInvite(): Promise<OrganizationInvite | null> {
|
||||||
const orgInvite = await this.acceptOrganizationInviteService.getOrganizationInvite();
|
return await this.acceptOrganizationInviteService.getOrganizationInvite();
|
||||||
if (orgInvite != null) {
|
|
||||||
await this.initPasswordPolicies(orgInvite);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getPasswordPolicies(invite: OrganizationInvite): Promise<PasswordPolicies> {
|
||||||
|
let policies: Policy[];
|
||||||
|
|
||||||
|
try {
|
||||||
|
policies = await this.policyApiService.getPoliciesByToken(
|
||||||
|
invite.organizationId,
|
||||||
|
invite.token,
|
||||||
|
invite.email,
|
||||||
|
invite.organizationUserId,
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
this.logService.error(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,8 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/sym
|
||||||
import { CsprngArray } from "@bitwarden/common/types/csprng";
|
import { CsprngArray } from "@bitwarden/common/types/csprng";
|
||||||
import { MasterKey, UserKey } from "@bitwarden/common/types/key";
|
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 { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
|
||||||
import { OrganizationInvite } from "../../../organization-invite/organization-invite";
|
|
||||||
|
|
||||||
import { WebRegistrationFinishService } from "./web-registration-finish.service";
|
import { WebRegistrationFinishService } from "./web-registration-finish.service";
|
||||||
|
|
||||||
|
|
|
@ -30,10 +30,10 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
|
||||||
import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
|
import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
|
||||||
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
|
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
import { flagEnabled } from "../../../utils/flags";
|
import { flagEnabled } from "../../../utils/flags";
|
||||||
import { RouterService } from "../../core";
|
import { RouterService } from "../../core";
|
||||||
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
||||||
import { OrganizationInvite } from "../organization-invite/organization-invite";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-login",
|
selector: "app-login",
|
||||||
|
|
|
@ -7,10 +7,10 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
|
||||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
import { BaseAcceptComponent } from "../../common/base.accept.component";
|
import { BaseAcceptComponent } from "../../common/base.accept.component";
|
||||||
|
|
||||||
import { AcceptOrganizationInviteService } from "./accept-organization.service";
|
import { AcceptOrganizationInviteService } from "./accept-organization.service";
|
||||||
import { OrganizationInvite } from "./organization-invite";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
templateUrl: "accept-organization.component.html",
|
templateUrl: "accept-organization.component.html",
|
||||||
|
|
|
@ -17,13 +17,13 @@ import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
|
||||||
import { FakeGlobalState } from "@bitwarden/common/spec/fake-state";
|
import { FakeGlobalState } from "@bitwarden/common/spec/fake-state";
|
||||||
import { OrgKey } from "@bitwarden/common/types/key";
|
import { OrgKey } from "@bitwarden/common/types/key";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
import { I18nService } from "../../core/i18n.service";
|
import { I18nService } from "../../core/i18n.service";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
AcceptOrganizationInviteService,
|
AcceptOrganizationInviteService,
|
||||||
ORGANIZATION_INVITE,
|
ORGANIZATION_INVITE,
|
||||||
} from "./accept-organization.service";
|
} from "./accept-organization.service";
|
||||||
import { OrganizationInvite } from "./organization-invite";
|
|
||||||
|
|
||||||
describe("AcceptOrganizationInviteService", () => {
|
describe("AcceptOrganizationInviteService", () => {
|
||||||
let sut: AcceptOrganizationInviteService;
|
let sut: AcceptOrganizationInviteService;
|
||||||
|
|
|
@ -27,7 +27,7 @@ import {
|
||||||
} from "@bitwarden/common/platform/state";
|
} from "@bitwarden/common/platform/state";
|
||||||
import { OrgKey } from "@bitwarden/common/types/key";
|
import { OrgKey } from "@bitwarden/common/types/key";
|
||||||
|
|
||||||
import { OrganizationInvite } from "./organization-invite";
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
|
|
||||||
// We're storing the organization invite for 2 reasons:
|
// We're storing the organization invite for 2 reasons:
|
||||||
// 1. If the org requires a MP policy check, we need to keep track that the user has already been redirected when they return.
|
// 1. If the org requires a MP policy check, we need to keep track that the user has already been redirected when they return.
|
||||||
|
|
|
@ -18,10 +18,10 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
|
||||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
import { RouterService } from "../../core";
|
import { RouterService } from "../../core";
|
||||||
import { SharedModule } from "../../shared";
|
import { SharedModule } from "../../shared";
|
||||||
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
||||||
import { OrganizationInvite } from "../organization-invite/organization-invite";
|
|
||||||
|
|
||||||
import { TrialInitiationComponent } from "./trial-initiation.component";
|
import { TrialInitiationComponent } from "./trial-initiation.component";
|
||||||
import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
|
import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
|
||||||
|
|
|
@ -14,13 +14,13 @@ import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenc
|
||||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "../../../../../../libs/auth/src/common/models/domain/organization-invite";
|
||||||
import {
|
import {
|
||||||
OrganizationCreatedEvent,
|
OrganizationCreatedEvent,
|
||||||
SubscriptionProduct,
|
SubscriptionProduct,
|
||||||
TrialOrganizationType,
|
TrialOrganizationType,
|
||||||
} from "../../billing/accounts/trial-initiation/trial-billing-step.component";
|
} from "../../billing/accounts/trial-initiation/trial-billing-step.component";
|
||||||
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
|
||||||
import { OrganizationInvite } from "../organization-invite/organization-invite";
|
|
||||||
|
|
||||||
import { RouterService } from "./../../core/router.service";
|
import { RouterService } from "./../../core/router.service";
|
||||||
import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
|
import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
|
||||||
|
|
|
@ -1,13 +1,19 @@
|
||||||
import { UrlTree } from "@angular/router";
|
import { UrlTree } from "@angular/router";
|
||||||
|
|
||||||
import { LoginService } from "./login.service";
|
import { OrganizationInvite } from "@bitwarden/auth/common";
|
||||||
|
|
||||||
|
import { LoginService, PasswordPolicies } from "./login.service";
|
||||||
|
|
||||||
export class DefaultLoginService implements LoginService {
|
export class DefaultLoginService implements LoginService {
|
||||||
setPreviousUrl(route: UrlTree): void | null {
|
setPreviousUrl(route: UrlTree): void | null {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleExistingOrgInvite(): Promise<void | null> {
|
async getOrganizationInvite(): Promise<OrganizationInvite | null> {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPasswordPolicies(invite: OrganizationInvite): Promise<PasswordPolicies | null> {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,12 @@ import { first, firstValueFrom, Subject, takeUntil } from "rxjs";
|
||||||
|
|
||||||
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
||||||
import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
|
import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
|
||||||
|
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
|
||||||
|
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
||||||
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
||||||
|
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
|
||||||
import { ClientType } from "@bitwarden/common/enums";
|
import { ClientType } from "@bitwarden/common/enums";
|
||||||
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
import {
|
import {
|
||||||
AsyncActionsModule,
|
AsyncActionsModule,
|
||||||
|
@ -41,18 +46,26 @@ export class LoginComponentV2 implements OnInit {
|
||||||
|
|
||||||
private destroy$ = new Subject<void>();
|
private destroy$ = new Subject<void>();
|
||||||
|
|
||||||
|
// Web specific properties
|
||||||
|
enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
|
||||||
|
policies: Policy[];
|
||||||
|
showResetPasswordAutoEnrollWarning = false;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private activatedRoute: ActivatedRoute,
|
private activatedRoute: ActivatedRoute,
|
||||||
private formBuilder: FormBuilder,
|
private formBuilder: FormBuilder,
|
||||||
private loginEmailService: LoginEmailServiceAbstraction,
|
private loginEmailService: LoginEmailServiceAbstraction,
|
||||||
private loginService: LoginService,
|
private loginService: LoginService,
|
||||||
|
private logService: LogService,
|
||||||
private platformUtilsService: PlatformUtilsService,
|
private platformUtilsService: PlatformUtilsService,
|
||||||
|
private policyApiService: PolicyApiServiceAbstraction,
|
||||||
|
private policyService: InternalPolicyService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
) {}
|
) {
|
||||||
|
this.clientType = this.platformUtilsService.getClientType();
|
||||||
|
}
|
||||||
|
|
||||||
async ngOnInit(): Promise<void> {
|
async ngOnInit(): Promise<void> {
|
||||||
this.clientType = this.platformUtilsService.getClientType();
|
|
||||||
|
|
||||||
if (this.clientType === ClientType.Web) {
|
if (this.clientType === ClientType.Web) {
|
||||||
await this.webOnInit();
|
await this.webOnInit();
|
||||||
}
|
}
|
||||||
|
@ -66,17 +79,30 @@ export class LoginComponentV2 implements OnInit {
|
||||||
|
|
||||||
const qParamsEmail = params.email;
|
const qParamsEmail = params.email;
|
||||||
|
|
||||||
|
// If there is an email in the query params, set that email as the form field value
|
||||||
if (qParamsEmail?.indexOf("@") > -1) {
|
if (qParamsEmail?.indexOf("@") > -1) {
|
||||||
this.formGroup.controls.email.setValue(qParamsEmail);
|
this.formGroup.controls.email.setValue(qParamsEmail);
|
||||||
paramEmailIsSet = true;
|
paramEmailIsSet = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// If there is no email in the query params, attempt to load email settings from loginEmailService
|
||||||
if (!paramEmailIsSet) {
|
if (!paramEmailIsSet) {
|
||||||
await this.loadEmailSettings();
|
await this.loadEmailSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.clientType === ClientType.Web) {
|
||||||
// If there's an existing org invite, use it to get the password policies
|
// If there's an existing org invite, use it to get the password policies
|
||||||
await this.loginService.handleExistingOrgInvite();
|
const orgInvite = await this.loginService.getOrganizationInvite();
|
||||||
|
if (orgInvite != null) {
|
||||||
|
const { policies, isPolicyAndAutoEnrollEnabled, enforcedPasswordPolicyOptions } =
|
||||||
|
await this.loginService.getPasswordPolicies(orgInvite);
|
||||||
|
|
||||||
|
this.policies = policies;
|
||||||
|
this.showResetPasswordAutoEnrollWarning = isPolicyAndAutoEnrollEnabled;
|
||||||
|
this.enforcedPasswordPolicyOptions = enforcedPasswordPolicyOptions;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
submit = async () => {};
|
submit = async () => {};
|
||||||
|
|
|
@ -1,7 +1,18 @@
|
||||||
import { UrlTree } from "@angular/router";
|
import { UrlTree } from "@angular/router";
|
||||||
|
|
||||||
|
import { OrganizationInvite } from "@bitwarden/auth/common";
|
||||||
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
||||||
|
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
|
||||||
|
|
||||||
|
export interface PasswordPolicies {
|
||||||
|
policies: Policy[];
|
||||||
|
isPolicyAndAutoEnrollEnabled: boolean;
|
||||||
|
enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
|
||||||
|
}
|
||||||
|
|
||||||
export abstract class LoginService {
|
export abstract class LoginService {
|
||||||
// Web specific
|
// Web specific
|
||||||
|
getOrganizationInvite: () => Promise<OrganizationInvite | null>;
|
||||||
|
getPasswordPolicies: (invite: OrganizationInvite) => Promise<PasswordPolicies | null>;
|
||||||
setPreviousUrl: (route: UrlTree) => void | null;
|
setPreviousUrl: (route: UrlTree) => void | null;
|
||||||
handleExistingOrgInvite: () => Promise<void | null>;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
export * from "./organization-invite";
|
||||||
export * from "./rotateable-key-set";
|
export * from "./rotateable-key-set";
|
||||||
export * from "./login-credentials";
|
export * from "./login-credentials";
|
||||||
export * from "./user-decryption-options";
|
export * from "./user-decryption-options";
|
||||||
|
|
Loading…
Reference in New Issue