mirror of
https://github.com/bitwarden/browser
synced 2026-02-17 18:09:17 +00:00
* Added abstractions for PolicyApiService and PolicyService * Added implementations for PolicyApiService and PolicyService * Updated all references to new PolicyApiService and PolicyService * Deleted old PolicyService abstraction and implementation * Fixed CLI import path for policy.service * Fixed main.background.ts policyApiService dependency for policyService * Ran prettier * Updated policy-api.service with the correct imports * [EC-377] Removed methods from StateService that read policies * [EC-377] Updated policy service getAll method to use observable collection * [EC-377] Added first unit tests for policy service * [EC-377] Added more unit tests for Policy Service * [EC-376] Sorted methods order in PolicyApiService * [EC-376] Removed unused clearCache method from PolicyService * [EC-376] Added upsert method to PolicyService * [EC-376] PolicyApiService putPolicy method now upserts data to PolicyService * [EC-377] Removed tests for deleted clearCache method * [EC-377] Added unit test for PolicyService.upsert * [EC-377] Updated references to state service observables * [EC-377] Removed getAll method from PolicyService and refactored components to use observable collection * [EC-377] Updated components to use concatMap instead of async subscribe * [EC-377] Removed getPolicyForOrganization from policyApiService * [EC-377] Updated policyAppliesToUser to return observable collection * [EC-377] Changed policyService.policyAppliesToUser to return observable * [EC-377] Fixed browser settings.component.ts getting vault timeout * Updated people.component.ts to get ResetPassword policy through a subscription * [EC-377] Changed passwordGenerationService.getOptions to return observable * [EC-377] Fixed CLI generate.command.ts getting enforcePasswordGeneratorPoliciesOnOptions * [EC-377] Fixed eslint errors on rxjs * [EC-377] Reverted changes on passwordGeneration.service and vaultTimeout.service * [EC-377] Removed eslint disable on web/vault/add-edit-component * [EC-377] Changed AccountData.policies to TemporaryDataEncryption * [EC-377] Updated import.component to be reactive to policyAppliesToUser$ * [EC-377] Updated importBlockedByPolicy$ * [EC-377] Fixed missing rename * [EC-377] Updated policyService.masterPasswordPolicyOptions to return observable * [EC-377] Fixed vaultTimeout imports from merge * [EC-377] Reverted call to passwordGenerationService.getOptions * [EC-377] Reverted call to enforcePasswordGeneratorPoliciesOnOptions * [EC-377] Removed unneeded ngOnDestroy * Apply suggestions from code review Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com> * [EC-377] Fixed login.component.ts and register.component.ts * [EC-377] Updated PolicyService to update vaultTimeout * [EC-377] Updated PolicyService dependencies * [EC-377] Renamed policyAppliesToUser to policyAppliesToActiveUser * [EC-377] VaultTimeoutSettings service now gets the vault timeout directly instead of using observables * [EC-377] Fixed unit tests by removing unneeded vaultTimeoutSettingsService * [EC-377] Set getDecryptedPolicies and setDecryptedPolicies as deprecated * [EC-377] Set PolicyService.getAll as deprecated and updated to use prototype.hasOwnProperty * [EC-565] Reverted unintended change to vaultTimeoutSettings that was causing a bug to not display the correct vault timeout * [EC-377] Removed unneeded destroy$ from preferences.component.ts * [EC-377] Fixed policy.service.ts import of OrganizationService Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com> Co-authored-by: mimartin12 <77340197+mimartin12@users.noreply.github.com>
150 lines
5.6 KiB
TypeScript
150 lines
5.6 KiB
TypeScript
import { Component, OnDestroy, OnInit } from "@angular/core";
|
|
import { UntypedFormBuilder } from "@angular/forms";
|
|
import { ActivatedRoute, Router } from "@angular/router";
|
|
import { Subject, takeUntil } from "rxjs";
|
|
import { first } from "rxjs/operators";
|
|
|
|
import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { AuthService } from "@bitwarden/common/abstractions/auth.service";
|
|
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
|
import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
|
|
import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
|
|
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
|
import { LogService } from "@bitwarden/common/abstractions/log.service";
|
|
import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
|
|
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
|
import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
|
|
import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
|
|
import { StateService } from "@bitwarden/common/abstractions/state.service";
|
|
import { PolicyData } from "@bitwarden/common/models/data/policyData";
|
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
|
|
import { Policy } from "@bitwarden/common/models/domain/policy";
|
|
import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest";
|
|
|
|
import { RouterService } from "../core";
|
|
|
|
@Component({
|
|
selector: "app-register",
|
|
templateUrl: "register.component.html",
|
|
})
|
|
export class RegisterComponent extends BaseRegisterComponent implements OnInit, OnDestroy {
|
|
email = "";
|
|
showCreateOrgMessage = false;
|
|
layout = "";
|
|
enforcedPolicyOptions: MasterPasswordPolicyOptions;
|
|
|
|
private policies: Policy[];
|
|
private destroy$ = new Subject<void>();
|
|
|
|
constructor(
|
|
formValidationErrorService: FormValidationErrorsService,
|
|
formBuilder: UntypedFormBuilder,
|
|
authService: AuthService,
|
|
router: Router,
|
|
i18nService: I18nService,
|
|
cryptoService: CryptoService,
|
|
apiService: ApiService,
|
|
private route: ActivatedRoute,
|
|
stateService: StateService,
|
|
platformUtilsService: PlatformUtilsService,
|
|
passwordGenerationService: PasswordGenerationService,
|
|
private policyApiService: PolicyApiServiceAbstraction,
|
|
private policyService: PolicyService,
|
|
environmentService: EnvironmentService,
|
|
logService: LogService,
|
|
private routerService: RouterService
|
|
) {
|
|
super(
|
|
formValidationErrorService,
|
|
formBuilder,
|
|
authService,
|
|
router,
|
|
i18nService,
|
|
cryptoService,
|
|
apiService,
|
|
stateService,
|
|
platformUtilsService,
|
|
passwordGenerationService,
|
|
environmentService,
|
|
logService
|
|
);
|
|
}
|
|
|
|
async ngOnInit() {
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
this.route.queryParams.pipe(first()).subscribe((qParams) => {
|
|
this.referenceData = new ReferenceEventRequest();
|
|
if (qParams.email != null && qParams.email.indexOf("@") > -1) {
|
|
this.email = qParams.email;
|
|
}
|
|
if (qParams.premium != null) {
|
|
this.routerService.setPreviousUrl("/settings/premium");
|
|
} else if (qParams.org != null) {
|
|
this.showCreateOrgMessage = true;
|
|
this.referenceData.flow = qParams.org;
|
|
const route = this.router.createUrlTree(["create-organization"], {
|
|
queryParams: { plan: qParams.org },
|
|
});
|
|
this.routerService.setPreviousUrl(route.toString());
|
|
}
|
|
if (qParams.layout != null) {
|
|
this.layout = this.referenceData.layout = qParams.layout;
|
|
}
|
|
if (qParams.reference != null) {
|
|
this.referenceData.id = qParams.reference;
|
|
} else {
|
|
this.referenceData.id = ("; " + document.cookie)
|
|
.split("; reference=")
|
|
.pop()
|
|
.split(";")
|
|
.shift();
|
|
}
|
|
// Are they coming from an email for sponsoring a families organization
|
|
if (qParams.sponsorshipToken != null) {
|
|
// After logging in redirect them to setup the families sponsorship
|
|
const route = this.router.createUrlTree(["setup/families-for-enterprise"], {
|
|
queryParams: { plan: qParams.sponsorshipToken },
|
|
});
|
|
this.routerService.setPreviousUrl(route.toString());
|
|
}
|
|
if (this.referenceData.id === "") {
|
|
this.referenceData.id = null;
|
|
}
|
|
});
|
|
const invite = await this.stateService.getOrganizationInvitation();
|
|
if (invite != null) {
|
|
try {
|
|
const policies = await this.policyApiService.getPoliciesByToken(
|
|
invite.organizationId,
|
|
invite.token,
|
|
invite.email,
|
|
invite.organizationUserId
|
|
);
|
|
if (policies.data != null) {
|
|
const policiesData = policies.data.map((p) => new PolicyData(p));
|
|
this.policies = policiesData.map((p) => new Policy(p));
|
|
}
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
}
|
|
}
|
|
|
|
if (this.policies != null) {
|
|
this.policyService
|
|
.masterPasswordPolicyOptions$(this.policies)
|
|
.pipe(takeUntil(this.destroy$))
|
|
.subscribe((enforcedPasswordPolicyOptions) => {
|
|
this.enforcedPolicyOptions = enforcedPasswordPolicyOptions;
|
|
});
|
|
}
|
|
|
|
await super.ngOnInit();
|
|
}
|
|
|
|
ngOnDestroy(): void {
|
|
this.destroy$.next();
|
|
this.destroy$.complete();
|
|
}
|
|
}
|