bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-24 16:43:27 +00:00
Code Issues Releases Wiki Activity

PM-14445: Wrong formatting due to merge conflict

Browse Source
This commit is contained in:
Maciej Zieniuk
2024-11-05 12:25:33 +00:00
parent 6340bac6f2
commit 91fc1fa630
48 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/common/src/platform/services/state.service.ts
View File

@@ -404,11 +404,11 @@ export class StateService<
}
const account = options?.useSecureStorage
? (await this.secureStorageService.get<TAccount>(options.userId, options)) ??
? ((await this.secureStorageService.get<TAccount>(options.userId, options)) ??
(await this.storageService.get<TAccount>(
options.userId,
this.reconcileOptions(options, { htmlStorageLocation: HtmlStorageLocation.Local }),
))
)))
: await this.storageService.get<TAccount>(options.userId, options);
return account;
}

2
libs/common/src/platform/state/derive-definition.ts
View File

@@ -164,7 +164,7 @@ export class DeriveDefinition<TFrom, TTo, TDeps extends DerivedStateDependencies
}
get cleanupDelayMs() {
return this.options.cleanupDelayMs < 0 ? 0 : this.options.cleanupDelayMs ?? 1000;
return this.options.cleanupDelayMs < 0 ? 0 : (this.options.cleanupDelayMs ?? 1000);
}
get clearOnCleanup() {

2
libs/common/src/platform/state/key-definition.ts
View File

@@ -104,7 +104,7 @@ export class KeyDefinition<T> {
* Gets the number of milliseconds to wait before cleaning up the state after the last subscriber has unsubscribed.
*/
get cleanupDelayMs() {
return this.options.cleanupDelayMs < 0 ? 0 : this.options.cleanupDelayMs ?? 1000;
return this.options.cleanupDelayMs < 0 ? 0 : (this.options.cleanupDelayMs ?? 1000);
}
/**

2
libs/common/src/platform/state/user-key-definition.ts
View File

@@ -63,7 +63,7 @@ export class UserKeyDefinition<T> {
* Gets the number of milliseconds to wait before cleaning up the state after the last subscriber has unsubscribed.
*/
get cleanupDelayMs() {
return this.options.cleanupDelayMs < 0 ? 0 : this.options.cleanupDelayMs ?? 1000;
return this.options.cleanupDelayMs < 0 ? 0 : (this.options.cleanupDelayMs ?? 1000);
}
/**

2
libs/common/src/tools/integration/integration-context.ts
View File

@@ -60,7 +60,7 @@ export class IntegrationContext<Settings extends object> {
options: { base64?: boolean; suffix?: string } = null,
): Settings extends ApiSettings ? string : never {
// normalize `token` then assert it has a value
let token = "token" in this.settings ? (this.settings.token as string) ?? "" : "";
let token = "token" in this.settings ? ((this.settings.token as string) ?? "") : "";
if (token === "") {
const error = this.i18n.t("forwaderInvalidToken", this.metadata.name);
throw error;

2
libs/common/src/tools/integration/rpc/rest-client.ts
View File

@@ -91,7 +91,7 @@ export class RestClient {
const message = parsed.message?.toString() ?? null;
// `false` signals no message found
const result = error && message ? `${error}: ${message}` : error ?? message ?? false;
const result = error && message ? `${error}: ${message}` : (error ?? message ?? false);
return result;
}