diff --git a/apps/web/src/app/tools/send/send-access/access.component.html b/apps/web/src/app/tools/send/send-access/access.component.html
index ab68c9e0523..de42ca8ef08 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.html
+++ b/apps/web/src/app/tools/send/send-access/access.component.html
@@ -1,12 +1,16 @@
@switch (viewState()) {
@case ("auth") {
-
+
}
@case ("view") {
}
diff --git a/apps/web/src/app/tools/send/send-access/access.component.ts b/apps/web/src/app/tools/send/send-access/access.component.ts
index 369955a7a75..fd8e3a282ba 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.ts
+++ b/apps/web/src/app/tools/send/send-access/access.component.ts
@@ -1,7 +1,5 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-// FIXME(https://bitwarden.atlassian.net/browse/CL-1062): `OnPush` components should not use mutable properties
-/* eslint-disable @bitwarden/components/enforce-readonly-angular-properties */
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, signal } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute } from "@angular/router";
@@ -27,25 +25,25 @@ type SendViewState = (typeof SendViewState)[keyof typeof SendViewState];
})
export class AccessComponent implements OnInit {
readonly viewState = signal(SendViewState.Auth);
- id: string;
- key: string;
+ readonly id = signal("");
+ readonly key = signal("");
- sendAccessToken: SendAccessToken | null = null;
+ readonly sendAccessToken = signal(null);
constructor(
- private route: ActivatedRoute,
- private destroyRef: DestroyRef,
+ private readonly route: ActivatedRoute,
+ private readonly destroyRef: DestroyRef,
) {}
ngOnInit() {
this.route.params.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
- this.id = params.sendId;
- this.key = params.key;
+ this.id.set(params.sendId);
+ this.key.set(params.key);
// when pasting sequential Send URLs into the browser,
// Angular reuses the SendAuthComponent instance
// Reset state so child components are recreated with fresh data
- this.sendAccessToken = null;
+ this.sendAccessToken.set(null);
// Temporarily set viewState to null to destroy the current child component,
// then set it back to Auth on the next tick to recreate it with the new id/key.
@@ -59,7 +57,7 @@ export class AccessComponent implements OnInit {
}
onAccessGranted(event: { accessToken: SendAccessToken }) {
- this.sendAccessToken = event.accessToken;
+ this.sendAccessToken.set(event.accessToken);
this.viewState.set(SendViewState.View);
}
}
diff --git a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
index 1d3779fda53..42b25851a7a 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
@@ -1,7 +1,5 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-// FIXME(https://bitwarden.atlassian.net/browse/CL-1062): `OnPush` components should not use mutable properties
-/* eslint-disable @bitwarden/components/enforce-readonly-angular-properties */
import { ChangeDetectionStrategy, Component, input } from "@angular/core";
import { firstValueFrom } from "rxjs";
@@ -31,15 +29,15 @@ export class SendAccessFileComponent {
readonly accessToken = input(null);
constructor(
- private i18nService: I18nService,
- private toastService: ToastService,
- private encryptService: EncryptService,
- private fileDownloadService: FileDownloadService,
- private sendApiService: SendApiService,
- private environmentService: EnvironmentService,
+ private readonly i18nService: I18nService,
+ private readonly toastService: ToastService,
+ private readonly encryptService: EncryptService,
+ private readonly fileDownloadService: FileDownloadService,
+ private readonly sendApiService: SendApiService,
+ private readonly environmentService: EnvironmentService,
) {}
- protected download = async () => {
+ protected readonly download = async () => {
const accessToken = this.accessToken();
if (this.send() == null || this.decKey() == null || !accessToken) {
return;
diff --git a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
index ce8cf149b6b..b2535b07fe8 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
@@ -1,7 +1,5 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-// FIXME(https://bitwarden.atlassian.net/browse/CL-1062): `OnPush` components should not use mutable properties
-/* eslint-disable @bitwarden/components/enforce-readonly-angular-properties */
import { ChangeDetectionStrategy, Component, input, OnDestroy, OnInit } from "@angular/core";
import { FormControl, FormGroup, Validators } from "@angular/forms";
@@ -15,14 +13,13 @@ import { SharedModule } from "../../../shared";
})
export class SendAccessPasswordComponent implements OnInit, OnDestroy {
protected readonly formGroup = input.required();
- protected password: FormControl;
+ protected readonly password = new FormControl("", Validators.required);
readonly loading = input.required();
constructor() {}
ngOnInit() {
- this.password = new FormControl("", Validators.required);
this.formGroup().addControl("password", this.password);
}
diff --git a/apps/web/src/app/tools/send/send-access/send-auth.component.ts b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
index eea55d942ed..46202c73be5 100644
--- a/apps/web/src/app/tools/send/send-access/send-auth.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
@@ -1,5 +1,3 @@
-// FIXME(https://bitwarden.atlassian.net/browse/CL-1062): `OnPush` components should not use mutable properties
-/* eslint-disable @bitwarden/components/enforce-readonly-angular-properties */
import { ChangeDetectionStrategy, Component, input, OnInit, output, signal } from "@angular/core";
import { FormBuilder } from "@angular/forms";
import { firstValueFrom } from "rxjs";
@@ -39,14 +37,14 @@ export class SendAuthComponent implements OnInit {
protected readonly id = input.required();
protected readonly key = input.required();
- protected accessGranted = output<{
+ protected readonly accessGranted = output<{
accessToken: SendAccessToken;
}>();
- authType = AuthType;
+ readonly authType = AuthType;
- private expiredAuthAttempts = 0;
- private otpSubmitted = false;
+ private readonly expiredAuthAttempts = signal(0);
+ private readonly otpSubmitted = signal(false);
readonly loading = signal(false);
readonly error = signal(false);
@@ -54,15 +52,19 @@ export class SendAuthComponent implements OnInit {
readonly sendAuthType = signal(AuthType.None);
readonly enterOtp = signal(false);
- sendAccessForm = this.formBuilder.group<{ password?: string; email?: string; otp?: string }>({});
+ readonly sendAccessForm = this.formBuilder.group<{
+ password?: string;
+ email?: string;
+ otp?: string;
+ }>({});
constructor(
- private cryptoFunctionService: CryptoFunctionService,
- private toastService: ToastService,
- private i18nService: I18nService,
- private formBuilder: FormBuilder,
- private sendTokenService: SendTokenService,
- private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
+ private readonly cryptoFunctionService: CryptoFunctionService,
+ private readonly toastService: ToastService,
+ private readonly i18nService: I18nService,
+ private readonly formBuilder: FormBuilder,
+ private readonly sendTokenService: SendTokenService,
+ private readonly anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
) {}
ngOnInit() {
@@ -82,7 +84,7 @@ export class SendAuthComponent implements OnInit {
onBackToEmail() {
this.enterOtp.set(false);
- this.otpSubmitted = false;
+ this.otpSubmitted.set(false);
this.updatePageTitle();
}
@@ -109,16 +111,16 @@ export class SendAuthComponent implements OnInit {
: await firstValueFrom(this.sendTokenService.getSendAccessToken$(this.id(), sendAccessCreds));
if (response instanceof SendAccessToken) {
- this.expiredAuthAttempts = 0;
+ this.expiredAuthAttempts.set(0);
this.accessGranted.emit({ accessToken: response });
} else if (response.kind === "expired") {
- if (this.expiredAuthAttempts > 2) {
+ if (this.expiredAuthAttempts() > 2) {
return;
}
- this.expiredAuthAttempts++;
+ this.expiredAuthAttempts.update((attempts) => attempts + 1);
await this.getTokenWithRetry(sendAccessCreds);
} else if (response.kind === "expected_server") {
- this.expiredAuthAttempts = 0;
+ this.expiredAuthAttempts.set(0);
if (emailRequired(response.error)) {
this.sendAuthType.set(AuthType.Email);
this.updatePageTitle();
@@ -130,14 +132,14 @@ export class SendAuthComponent implements OnInit {
message: this.i18nService.t("codeResent"),
});
} else {
- if (this.otpSubmitted) {
+ if (this.otpSubmitted()) {
this.toastService.showToast({
variant: "error",
title: undefined,
message: this.i18nService.t("invalidVerificationCode"),
});
}
- this.otpSubmitted = true;
+ this.otpSubmitted.set(true);
}
this.enterOtp.set(true);
this.updatePageTitle();
@@ -160,7 +162,7 @@ export class SendAuthComponent implements OnInit {
});
}
} else {
- this.expiredAuthAttempts = 0;
+ this.expiredAuthAttempts.set(0);
this.error.set(true);
this.toastService.showToast({
variant: "error",
diff --git a/apps/web/src/app/tools/send/send-access/send-view.component.html b/apps/web/src/app/tools/send/send-access/send-view.component.html
index b48d9273606..c7052311538 100644
--- a/apps/web/src/app/tools/send/send-access/send-view.component.html
+++ b/apps/web/src/app/tools/send/send-access/send-view.component.html
@@ -37,7 +37,7 @@
@case (sendType.File) {
}
diff --git a/apps/web/src/app/tools/send/send-access/send-view.component.ts b/apps/web/src/app/tools/send/send-access/send-view.component.ts
index 5449a864af7..5fd07d00143 100644
--- a/apps/web/src/app/tools/send/send-access/send-view.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-view.component.ts
@@ -1,5 +1,3 @@
-// FIXME(https://bitwarden.atlassian.net/browse/CL-1062): `OnPush` components should not use mutable properties
-/* eslint-disable @bitwarden/components/enforce-readonly-angular-properties */
import {
ChangeDetectionStrategy,
Component,
@@ -50,7 +48,7 @@ export class SendViewComponent implements OnInit {
readonly key = input.required();
readonly accessToken = input(null);
- authRequired = output();
+ readonly authRequired = output();
readonly send = signal(null);
readonly expirationDate = computed(() => this.send()?.expirationDate ?? null);
@@ -64,15 +62,15 @@ export class SendViewComponent implements OnInit {
readonly unavailable = signal(false);
readonly error = signal(false);
- sendType = SendType;
- decKey!: SymmetricCryptoKey;
+ readonly sendType = SendType;
+ readonly decKey = signal(null);
constructor(
- private sendApiService: SendApiService,
- private toastService: ToastService,
- private i18nService: I18nService,
- private layoutWrapperDataService: AnonLayoutWrapperDataService,
- private sendDecryptionService: SendDecryptionService,
+ private readonly sendApiService: SendApiService,
+ private readonly toastService: ToastService,
+ private readonly i18nService: I18nService,
+ private readonly layoutWrapperDataService: AnonLayoutWrapperDataService,
+ private readonly sendDecryptionService: SendDecryptionService,
) {}
ngOnInit() {
@@ -99,7 +97,7 @@ export class SendViewComponent implements OnInit {
response,
keyArray,
);
- this.decKey = decKey;
+ this.decKey.set(decKey);
this.send.set(decSend);
} catch (e) {
this.send.set(null);