vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Revert "[EC-772] Add i18n key typechecking in web (#4023)" (#4296) 

This reverts commit 5a1940f3f4.
This commit is contained in:
Robyn MacCallum 2022-12-21 17:46:23 -05:00 committed by GitHub
parent eeb407b8a4
commit 3a98b415b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 109 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/browser/src/background/main.background.ts
View File

@ -92,7 +92,6 @@ import { BrowserStateService as StateServiceAbstraction } from "../services/abst
import AutofillService from "../services/autofill.service";
import { BrowserEnvironmentService } from "../services/browser-environment.service";
import { BrowserFolderService } from "../services/browser-folder.service";
import BrowserI18nServiceImplementation from "../services/browser-i18n.service.implementation";
import { BrowserOrganizationService } from "../services/browser-organization.service";
import { BrowserPolicyService } from "../services/browser-policy.service";
import { BrowserSettingsService } from "../services/browser-settings.service";
@ -102,6 +101,7 @@ import BrowserLocalStorageService from "../services/browserLocalStorage.service"
import BrowserMessagingService from "../services/browserMessaging.service";
import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
import I18nService from "../services/i18n.service";
import { KeyGenerationService } from "../services/keyGeneration.service";
import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
import { VaultFilterService } from "../services/vaultFilter.service";
@ -260,7 +260,7 @@ export default class MainBackground {
},
window
);
this.i18nService = new BrowserI18nServiceImplementation(BrowserApi.getUILanguage(window));
this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
this.encryptService = flagEnabled("multithreadDecryption")
? new MultithreadEncryptServiceImplementation(
this.cryptoFunctionService,
@ -566,7 +566,7 @@ export default class MainBackground {
await this.stateService.init();
await (this.vaultTimeoutService as VaultTimeoutService).init(true);
await (this.i18nService as BrowserI18nServiceImplementation).init();
await (this.i18nService as I18nService).init();
await (this.eventUploadService as EventUploadService).init(true);
await this.runtimeBackground.init();
await this.notificationBackground.init();

16
apps/browser/src/background/service_factories/i18n-service.factory.ts
View File

@ -1,7 +1,7 @@
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as AbstractI18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
import BrowserI18nServiceImplementation from "../../services/browser-i18n.service.implementation";
import I18nService from "../../services/i18n.service";
import { FactoryOptions, CachedServices, factory } from "./factory-options";
@ -14,17 +14,17 @@ type I18nServiceFactoryOptions = FactoryOptions & {
export type I18nServiceInitOptions = I18nServiceFactoryOptions;
export async function i18nServiceFactory(
cache: { i18nService?: I18nService } & CachedServices,
cache: { i18nService?: AbstractI18nService } & CachedServices,
opts: I18nServiceInitOptions
): Promise<I18nService> {
): Promise<AbstractI18nService> {
const service = await factory(
cache,
"i18nService",
opts,
() => new BrowserI18nServiceImplementation(opts.i18nServiceOptions.systemLanguage)
() => new I18nService(opts.i18nServiceOptions.systemLanguage)
);
if (!(service as I18nServiceImplementation as any).inited) {
await (service as I18nServiceImplementation).init();
if (!(service as BaseI18nService as any).inited) {
await (service as BaseI18nService).init();
}
return service;
}

4
apps/browser/src/services/browser-i18n.service.implementation.ts → apps/browser/src/services/i18n.service.ts
View File

@ -1,6 +1,6 @@
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
export default class BrowserI18nServiceImplementation extends I18nServiceImplementation {
export default class I18nService extends BaseI18nService {
constructor(systemLanguage: string) {
super(systemLanguage, null, async (formattedLocale: string) => {
// Deprecated

6
apps/cli/src/bw.ts
View File

@ -55,9 +55,9 @@ import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-
import { Program } from "./program";
import { SendProgram } from "./send.program";
import { CliI18nServiceImplementation } from "./services/cli-i18n.service.implementation";
import { CliPlatformUtilsService } from "./services/cli-platform-utils.service";
import { ConsoleLogService } from "./services/console-log.service";
import { I18nService } from "./services/i18n.service";
import { LowdbStorageService } from "./services/lowdb-storage.service";
import { NodeApiService } from "./services/node-api.service";
import { NodeEnvSecureStorageService } from "./services/node-env-secure-storage.service";
@ -74,7 +74,7 @@ export class Main {
storageService: LowdbStorageService;
secureStorageService: NodeEnvSecureStorageService;
memoryStorageService: MemoryStorageService;
i18nService: CliI18nServiceImplementation;
i18nService: I18nService;
platformUtilsService: CliPlatformUtilsService;
cryptoService: CryptoService;
tokenService: TokenService;
@ -136,7 +136,7 @@ export class Main {
p = path.join(process.env.HOME, ".config/Bitwarden CLI");
}
this.i18nService = new CliI18nServiceImplementation("en", "./locales");
this.i18nService = new I18nService("en", "./locales");
this.platformUtilsService = new CliPlatformUtilsService(ClientType.Cli, packageJson);
this.logService = new ConsoleLogService(
this.platformUtilsService.isDev(),

4
apps/cli/src/services/cli-i18n.service.implementation.ts → apps/cli/src/services/i18n.service.ts
View File

@ -1,9 +1,9 @@
import * as fs from "fs";
import * as path from "path";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
export class CliI18nServiceImplementation extends I18nServiceImplementation {
export class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) {
super(systemLanguage, localesDirectory, (formattedLocale: string) => {
const filePath = path.join(

4
apps/desktop/src/app/services/init.service.ts
View File

@ -17,7 +17,7 @@ import { ContainerService } from "@bitwarden/common/services/container.service";
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
import { DesktopI18nServiceImplementation } from "../../services/desktop-i18n.service.implementation";
import { I18nService } from "../../services/i18n.service";
import { NativeMessagingService } from "../../services/native-messaging.service";
@Injectable()
@ -47,7 +47,7 @@ export class InitService {
this.syncService.fullSync(true);
(this.vaultTimeoutService as VaultTimeoutService).init(true);
const locale = await this.stateService.getLocale();
await (this.i18nService as DesktopI18nServiceImplementation).init(locale);
await (this.i18nService as I18nService).init(locale);
(this.eventUploadService as EventUploadService).init(true);
this.twoFactorService.init();
setTimeout(() => this.notificationsService.init(), 3000);

4
apps/desktop/src/app/services/services.module.ts
View File

@ -41,7 +41,6 @@ import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.s
import { SystemService } from "@bitwarden/common/services/system.service";
import { Account } from "../../models/account";
import { DesktopI18nServiceImplementation } from "../../services/desktop-i18n.service.implementation";
import { ElectronCryptoService } from "../../services/electron-crypto.service";
import { ElectronLogService } from "../../services/electron-log.service";
import { ElectronPlatformUtilsService } from "../../services/electron-platform-utils.service";
@ -49,6 +48,7 @@ import { ElectronRendererMessagingService } from "../../services/electron-render
import { ElectronRendererSecureStorageService } from "../../services/electron-renderer-secure-storage.service";
import { ElectronRendererStorageService } from "../../services/electron-renderer-storage.service";
import { EncryptedMessageHandlerService } from "../../services/encrypted-message-handler.service";
import { I18nService } from "../../services/i18n.service";
import { NativeMessageHandlerService } from "../../services/native-message-handler.service";
import { NativeMessagingService } from "../../services/native-messaging.service";
import { PasswordRepromptService } from "../../services/password-reprompt.service";
@ -101,7 +101,7 @@ const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
},
{
provide: I18nServiceAbstraction,
useClass: DesktopI18nServiceImplementation,
useClass: I18nService,
deps: [SYSTEM_LANGUAGE, LOCALES_DIRECTORY],
},
{

6
apps/desktop/src/main.ts
View File

@ -17,14 +17,14 @@ import { TrayMain } from "./main/tray.main";
import { UpdaterMain } from "./main/updater.main";
import { WindowMain } from "./main/window.main";
import { Account } from "./models/account";
import { DesktopI18nServiceImplementation } from "./services/desktop-i18n.service.implementation";
import { ElectronLogService } from "./services/electron-log.service";
import { ElectronMainMessagingService } from "./services/electron-main-messaging.service";
import { ElectronStorageService } from "./services/electron-storage.service";
import { I18nService } from "./services/i18n.service";
export class Main {
logService: ElectronLogService;
i18nService: DesktopI18nServiceImplementation;
i18nService: I18nService;
storageService: ElectronStorageService;
memoryStorageService: MemoryStorageService;
messagingService: ElectronMainMessagingService;
@ -73,7 +73,7 @@ export class Main {
}
this.logService = new ElectronLogService(null, app.getPath("userData"));
this.i18nService = new DesktopI18nServiceImplementation("en", "./locales/");
this.i18nService = new I18nService("en", "./locales/");
const storageDefaults: any = {};
// Default vault timeout to "on restart", and action to "lock"

4
apps/desktop/src/services/desktop-i18n.service.implementation.ts → apps/desktop/src/services/i18n.service.ts
View File

@ -1,9 +1,9 @@
import * as fs from "fs";
import * as path from "path";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
export class DesktopI18nServiceImplementation extends I18nServiceImplementation {
export class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) {
super(systemLanguage, localesDirectory, (formattedLocale: string) => {
const filePath = path.join(

6
apps/web/src/app/components/nested-checkbox.component.ts
View File

@ -2,15 +2,13 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
import { Utils } from "@bitwarden/common/misc/utils";
import { WebI18nKey } from "../core/web-i18n.service.implementation";
@Component({
selector: "app-nested-checkbox",
templateUrl: "nested-checkbox.component.html",
})
export class NestedCheckboxComponent {
@Input() parentId: WebI18nKey;
@Input() checkboxes: { id: WebI18nKey; get: () => boolean; set: (v: boolean) => void }[];
@Input() parentId: string;
@Input() checkboxes: { id: string; get: () => boolean; set: (v: boolean) => void }[];
@Output() onSavedUser = new EventEmitter();
@Output() onDeletedUser = new EventEmitter();

9
apps/web/src/app/core/core.module.ts
View File

@ -12,7 +12,7 @@ import {
import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service";
import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service";
import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
@ -27,6 +27,7 @@ import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.s
import { BroadcasterMessagingService } from "./broadcaster-messaging.service";
import { EventService } from "./event.service";
import { HtmlStorageService } from "./html-storage.service";
import { I18nService } from "./i18n.service";
import { InitService } from "./init.service";
import { ModalService } from "./modal.service";
import { PasswordRepromptService } from "./password-reprompt.service";
@ -35,7 +36,6 @@ import { RouterService } from "./router.service";
import { Account, GlobalState, StateService } from "./state";
import { StateMigrationService } from "./state-migration.service";
import { WebFileDownloadService } from "./web-file-download.service";
import { WebI18nServiceImplementation } from "./web-i18n.service.implementation";
import { WebPlatformUtilsService } from "./web-platform-utils.service";
@NgModule({
@ -46,7 +46,6 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
RouterService,
EventService,
PolicyListService,
WebI18nServiceImplementation,
{
provide: APP_INITIALIZER,
useFactory: (initService: InitService) => initService.init(),
@ -62,8 +61,8 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
useValue: false,
},
{
provide: I18nService,
useClass: WebI18nServiceImplementation,
provide: I18nServiceAbstraction,
useClass: I18nService,
deps: [SYSTEM_LANGUAGE, LOCALES_DIRECTORY],
},
{ provide: AbstractStorageService, useClass: HtmlStorageService },

11
apps/web/src/app/core/web-i18n.service.implementation.ts → apps/web/src/app/core/i18n.service.ts
View File

@ -1,13 +1,6 @@
import { Injectable } from "@angular/core";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import type eng from "../../locales/en/messages.json";
export type WebI18nKey = keyof typeof eng;
@Injectable()
export class WebI18nServiceImplementation extends I18nServiceImplementation<WebI18nKey> {
export class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) {
super(systemLanguage || "en-US", localesDirectory, async (formattedLocale: string) => {
const filePath =

8
apps/web/src/app/core/init.service.ts
View File

@ -9,7 +9,7 @@ import {
Urls,
} from "@bitwarden/common/abstractions/environment.service";
import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
@ -18,7 +18,7 @@ import { ContainerService } from "@bitwarden/common/services/container.service";
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
import { WebI18nServiceImplementation } from "./web-i18n.service.implementation";
import { I18nService } from "./i18n.service";
@Injectable()
export class InitService {
@ -27,7 +27,7 @@ export class InitService {
private environmentService: EnvironmentServiceAbstraction,
private notificationsService: NotificationsServiceAbstraction,
private vaultTimeoutService: VaultTimeoutServiceAbstraction,
private i18nService: I18nService,
private i18nService: I18nServiceAbstraction,
private eventUploadService: EventUploadServiceAbstraction,
private twoFactorService: TwoFactorServiceAbstraction,
private stateService: StateServiceAbstraction,
@ -47,7 +47,7 @@ export class InitService {
setTimeout(() => this.notificationsService.init(), 3000);
(this.vaultTimeoutService as VaultTimeoutService).init(true);
const locale = await this.stateService.getLocale();
await (this.i18nService as WebI18nServiceImplementation).init(locale);
await (this.i18nService as I18nService).init(locale);
(this.eventUploadService as EventUploadService).init(true);
this.twoFactorService.init();
const htmlEl = this.win.document.documentElement;

10
apps/web/src/app/core/web-i18n.pipe.ts
View File

@ -1,10 +0,0 @@
import { Pipe } from "@angular/core";
import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
import { WebI18nKey } from "./web-i18n.service.implementation";
@Pipe({
name: "i18n",
})
export class WebI18nPipe extends I18nPipe<WebI18nKey> {}

2
apps/web/src/app/organizations/billing/adjust-subscription.component.ts
View File

@ -15,7 +15,7 @@ export class AdjustSubscription {
@Input() maxAutoscaleSeats: number;
@Input() currentSeatCount: number;
@Input() seatPrice = 0;
@Input() interval: "month" | "year" = "year";
@Input() interval = "year";
@Output() onAdjusted = new EventEmitter();
formPromise: Promise<void>;

4
apps/web/src/app/organizations/components/access-selector/access-selector.component.ts
View File

@ -6,8 +6,6 @@ import { FormSelectionList } from "@bitwarden/angular/utils/form-selection-list"
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { SelectItemView } from "@bitwarden/components/src/multi-select/models/select-item-view";
import { WebI18nKey } from "../../../core/web-i18n.service.implementation";
import {
AccessItemType,
AccessItemValue,
@ -85,7 +83,7 @@ export class AccessSelectorComponent implements ControlValueAccessor, OnInit, On
});
protected itemType = AccessItemType;
protected permissionList: { perm: CollectionPermission; labelId: WebI18nKey }[] = [
protected permissionList = [
{ perm: CollectionPermission.View, labelId: "canView" },
{ perm: CollectionPermission.ViewExceptPass, labelId: "canViewExceptPass" },
{ perm: CollectionPermission.Edit, labelId: "canEdit" },

4
apps/web/src/app/organizations/layouts/organization-layout.component.ts
View File

@ -14,8 +14,6 @@ import {
} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/models/domain/organization";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
@Component({
selector: "app-organization-layout",
templateUrl: "organization-layout.component.html",
@ -71,7 +69,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
return canAccessBillingTab(organization);
}
getReportTabLabel(organization: Organization): WebI18nKey {
getReportTabLabel(organization: Organization): string {
return organization.useEvents ? "reporting" : "reports";
}
}

8
apps/web/src/app/organizations/manage/user-add-edit.component.ts
View File

@ -20,10 +20,6 @@ import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selec
import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response";
import { CollectionView } from "@bitwarden/common/models/view/collection.view";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
type NestedCheckbox = { id: WebI18nKey; get: () => boolean; set: (v: boolean) => boolean };
@Component({
selector: "app-user-add-edit",
templateUrl: "user-add-edit.component.html",
@ -53,7 +49,7 @@ export class UserAddEditComponent implements OnInit {
organizationUserType = OrganizationUserType;
canUseCustomPermissions: boolean;
manageAllCollectionsCheckboxes: NestedCheckbox[] = [
manageAllCollectionsCheckboxes = [
{
id: "createNewCollections",
get: () => this.permissions.createNewCollections,
@ -71,7 +67,7 @@ export class UserAddEditComponent implements OnInit {
},
];
manageAssignedCollectionsCheckboxes: NestedCheckbox[] = [
manageAssignedCollectionsCheckboxes = [
{
id: "editAssignedCollections",
get: () => this.permissions.editAssignedCollections,

6
apps/web/src/app/organizations/policies/base-policy.component.ts
View File

@ -6,11 +6,9 @@ import { Organization } from "@bitwarden/common/models/domain/organization";
import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
import { PolicyResponse } from "@bitwarden/common/models/response/policy.response";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
export abstract class BasePolicy {
abstract name: WebI18nKey;
abstract description: WebI18nKey;
abstract name: string;
abstract description: string;
abstract type: PolicyType;
abstract component: any;

4
apps/web/src/app/organizations/policies/disable-send.component.ts
View File

@ -5,8 +5,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class DisableSendPolicy extends BasePolicy {
readonly name = "disableSend";
readonly description = "disableSendPolicyDesc";
name = "disableSend";
description = "disableSendPolicyDesc";
type = PolicyType.DisableSend;
component = DisableSendPolicyComponent;
}

4
apps/web/src/app/organizations/policies/master-password.component.ts
View File

@ -8,8 +8,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class MasterPasswordPolicy extends BasePolicy {
readonly name = "masterPassPolicyTitle";
readonly description = "masterPassPolicyDesc";
name = "masterPassPolicyTitle";
description = "masterPassPolicyDesc";
type = PolicyType.MasterPassword;
component = MasterPasswordPolicyComponent;
}

4
apps/web/src/app/organizations/policies/password-generator.component.ts
View File

@ -7,8 +7,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class PasswordGeneratorPolicy extends BasePolicy {
readonly name = "passwordGenerator";
readonly description = "passwordGeneratorPolicyDesc";
name = "passwordGenerator";
description = "passwordGeneratorPolicyDesc";
type = PolicyType.PasswordGenerator;
component = PasswordGeneratorPolicyComponent;
}

4
apps/web/src/app/organizations/policies/personal-ownership.component.ts
View File

@ -5,8 +5,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class PersonalOwnershipPolicy extends BasePolicy {
readonly name = "personalOwnership";
readonly description = "personalOwnershipPolicyDesc";
name = "personalOwnership";
description = "personalOwnershipPolicyDesc";
type = PolicyType.PersonalOwnership;
component = PersonalOwnershipPolicyComponent;
}

4
apps/web/src/app/organizations/policies/require-sso.component.ts
View File

@ -8,8 +8,8 @@ import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class RequireSsoPolicy extends BasePolicy {
readonly name = "requireSso";
readonly description = "requireSsoPolicyDesc";
name = "requireSso";
description = "requireSsoPolicyDesc";
type = PolicyType.RequireSso;
component = RequireSsoPolicyComponent;

4
apps/web/src/app/organizations/policies/reset-password.component.ts
View File

@ -8,8 +8,8 @@ import { Organization } from "@bitwarden/common/models/domain/organization";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class ResetPasswordPolicy extends BasePolicy {
readonly name = "resetPasswordPolicy";
readonly description = "resetPasswordPolicyDescription";
name = "resetPasswordPolicy";
description = "resetPasswordPolicyDescription";
type = PolicyType.ResetPassword;
component = ResetPasswordPolicyComponent;

4
apps/web/src/app/organizations/policies/send-options.component.ts
View File

@ -6,8 +6,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class SendOptionsPolicy extends BasePolicy {
readonly name = "sendOptions";
readonly description = "sendOptionsPolicyDesc";
name = "sendOptions";
description = "sendOptionsPolicyDesc";
type = PolicyType.SendOptions;
component = SendOptionsPolicyComponent;
}

4
apps/web/src/app/organizations/policies/single-org.component.ts
View File

@ -7,8 +7,8 @@ import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class SingleOrgPolicy extends BasePolicy {
readonly name = "singleOrg";
readonly description = "singleOrgDesc";
name = "singleOrg";
description = "singleOrgDesc";
type = PolicyType.SingleOrg;
component = SingleOrgPolicyComponent;
}

4
apps/web/src/app/organizations/policies/two-factor-authentication.component.ts
View File

@ -5,8 +5,8 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class TwoFactorAuthenticationPolicy extends BasePolicy {
readonly name = "twoStepLoginPolicyTitle";
readonly description = "twoStepLoginPolicyDesc";
name = "twoStepLoginPolicyTitle";
description = "twoStepLoginPolicyDesc";
type = PolicyType.TwoFactorAuthentication;
component = TwoFactorAuthenticationPolicyComponent;
}

15
apps/web/src/app/organizations/settings/delete-organization.component.ts
View File

@ -12,17 +12,15 @@ import { Utils } from "@bitwarden/common/misc/utils";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { Verification } from "@bitwarden/common/types/verification";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
class CountBasedLocalizationKey {
singular: WebI18nKey;
plural: WebI18nKey;
singular: string;
plural: string;
getKey(count: number) {
return count == 1 ? this.singular : this.plural;
}
constructor(singular: WebI18nKey, plural: WebI18nKey) {
constructor(singular: string, plural: string) {
this.singular = singular;
this.plural = plural;
}
@ -30,7 +28,7 @@ class CountBasedLocalizationKey {
class OrganizationContentSummaryItem {
count: number;
get localizationKey() {
get localizationKey(): string {
return this.localizationKeyOptions.getKey(this.count);
}
private localizationKeyOptions: CountBasedLocalizationKey;
@ -128,9 +126,6 @@ export class DeleteOrganizationComponent implements OnInit {
}
private getOrganizationItemLocalizationKeysByType(type: string): CountBasedLocalizationKey {
return new CountBasedLocalizationKey(
`type${type}` as WebI18nKey,
`type${type}Plural` as WebI18nKey
);
return new CountBasedLocalizationKey(`type${type}`, `type${type}Plural`);
}
}

6
apps/web/src/app/reports/pages/weak-passwords-report.component.ts
View File

@ -10,8 +10,6 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { BadgeTypes } from "@bitwarden/components";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
import { CipherReportComponent } from "./cipher-report.component";
@Component({
@ -19,7 +17,7 @@ import { CipherReportComponent } from "./cipher-report.component";
templateUrl: "weak-passwords-report.component.html",
})
export class WeakPasswordsReportComponent extends CipherReportComponent implements OnInit {
passwordStrengthMap = new Map<string, [WebI18nKey, BadgeTypes]>();
passwordStrengthMap = new Map<string, [string, BadgeTypes]>();
private passwordStrengthCache = new Map<string, number>();
@ -113,7 +111,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
return true;
}
private scoreKey(score: number): [WebI18nKey, BadgeTypes] {
private scoreKey(score: number): [string, BadgeTypes] {
switch (score) {
case 4:
return ["strong", "success"];

6
apps/web/src/app/reports/shared/models/report-entry.ts
View File

@ -1,12 +1,10 @@
import { Icon } from "@bitwarden/components";
import { WebI18nKey } from "../../../core/web-i18n.service.implementation";
import { ReportVariant } from "./report-variant";
export type ReportEntry = {
title: WebI18nKey;
description: WebI18nKey;
title: string;
description: string;
route: string;
icon: Icon;
variant: ReportVariant;

2
apps/web/src/app/settings/adjust-storage.component.ts
View File

@ -19,7 +19,7 @@ export class AdjustStorageComponent {
@Input() storageGbPrice = 0;
@Input() add = true;
@Input() organizationId: string;
@Input() interval: "month" | "year" = "year";
@Input() interval = "year";
@Output() onAdjusted = new EventEmitter<number>();
@Output() onCanceled = new EventEmitter();

8
apps/web/src/app/settings/api-key.component.ts
View File

@ -6,8 +6,6 @@ import { SecretVerificationRequest } from "@bitwarden/common/models/request/secr
import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response";
import { Verification } from "@bitwarden/common/types/verification";
import { WebI18nKey } from "../core/web-i18n.service.implementation";
@Component({
selector: "app-api-key",
templateUrl: "api-key.component.html",
@ -19,9 +17,9 @@ export class ApiKeyComponent {
entityId: string;
scope: string;
grantType: string;
apiKeyTitle: WebI18nKey;
apiKeyWarning: WebI18nKey;
apiKeyDescription: WebI18nKey;
apiKeyTitle: string;
apiKeyWarning: string;
apiKeyDescription: string;
masterPassword: Verification;
formPromise: Promise<ApiKeyResponse>;

5
apps/web/src/app/settings/billing-history.component.html
View File

@ -53,7 +53,10 @@
></i>
{{ t.details }}
</td>
<td [ngClass]="{ 'text-strike': t.refunded }" [title]="t.refunded ? ('refunded' | i18n) : ''">
<td
[ngClass]="{ 'text-strike': t.refunded }"
title="{{ (t.refunded ? 'refunded' : '') | i18n }}"
>
{{ t.amount | currency: "$" }}
</td>
</tr>

3
apps/web/src/app/shared/shared.module.ts
View File

@ -27,7 +27,6 @@ import {
// Register the locales for the application
import "./locales";
import { WebI18nPipe } from "../core/web-i18n.pipe";
/**
* This NgModule should contain the most basic shared directives, pipes, and components. They
@ -67,7 +66,6 @@ import { WebI18nPipe } from "../core/web-i18n.pipe";
// Web specific
],
declarations: [WebI18nPipe],
exports: [
CommonModule,
DragDropModule,
@ -97,7 +95,6 @@ import { WebI18nPipe } from "../core/web-i18n.pipe";
ColorPasswordModule,
// Web specific
WebI18nPipe,
],
providers: [DatePipe],
bootstrap: [],

4
apps/web/src/app/tests/preloaded-english-i18n.module.ts
View File

@ -1,11 +1,11 @@
import { APP_INITIALIZER, NgModule } from "@angular/core";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
import eng from "../../locales/en/messages.json";
class PreloadedEnglishI18nService extends I18nServiceImplementation {
class PreloadedEnglishI18nService extends BaseI18nService {
constructor() {
super("en", "", () => {
return Promise.resolve(eng);

4
apps/web/src/app/vault/shared/vault.service.ts
View File

@ -1,9 +1,7 @@
import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
export class VaultService {
calculateSearchBarLocalizationString(vaultFilter: VaultFilter): WebI18nKey {
calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {
if (vaultFilter.status === "favorites") {
return "searchFavorites";
}

4
apps/web/src/app/vault/vault-filter/vault-filter.component.ts
View File

@ -2,8 +2,6 @@ import { Component, EventEmitter, Output } from "@angular/core";
import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/vault-filter.component";
import { WebI18nKey } from "../../core/web-i18n.service.implementation";
import { VaultFilterService } from "./shared/vault-filter.service";
@Component({
@ -14,7 +12,7 @@ import { VaultFilterService } from "./shared/vault-filter.service";
export class VaultFilterComponent extends BaseVaultFilterComponent {
@Output() onSearchTextChanged = new EventEmitter<string>();
searchPlaceholder: WebI18nKey;
searchPlaceholder: string;
searchText = "";
constructor(protected vaultFilterService: VaultFilterService) {

12
apps/web/src/locales/en/messages.json
View File

@ -5789,18 +5789,6 @@
"switchProducts": {
"message": "Switch Products"
},
"searchMyVault": {
"message": "Search My Vault"
},
"searchOrganization": {
"message": "Search organization"
},
"noClientsInList": {
"message": "No clients in list"
},
"copy": {
"messages": "Copy"
},
"freeOrgInvLimitReachedManageBilling": {
"message": "Free organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
"placeholders": {

4
bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts
View File

@ -7,8 +7,8 @@ import {
} from "@bitwarden/web-vault/app/organizations/policies/base-policy.component";
export class DisablePersonalVaultExportPolicy extends BasePolicy {
readonly name = "disablePersonalVaultExport";
readonly description = "disablePersonalVaultExportDesc";
name = "disablePersonalVaultExport";
description = "disablePersonalVaultExportDesc";
type = PolicyType.DisablePersonalVaultExport;
component = DisablePersonalVaultExportPolicyComponent;
}

4
bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts
View File

@ -10,8 +10,8 @@ import {
} from "@bitwarden/web-vault/app/organizations/policies/base-policy.component";
export class MaximumVaultTimeoutPolicy extends BasePolicy {
readonly name = "maximumVaultTimeout";
readonly description = "maximumVaultTimeoutDesc";
name = "maximumVaultTimeout";
description = "maximumVaultTimeoutDesc";
type = PolicyType.MaximumVaultTimeout;
component = MaximumVaultTimeoutPolicyComponent;
}

10
bitwarden_license/bit-web/src/app/secrets-manager/layout/dialogs/bulk-status-dialog.component.ts
View File

@ -1,13 +1,11 @@
import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
import { Component, Inject, OnInit } from "@angular/core";
import { WebI18nKey } from "@bitwarden/web-vault/app/core/web-i18n.service.implementation";
export interface BulkStatusDetails {
title: WebI18nKey;
subTitle: WebI18nKey;
columnTitle: WebI18nKey;
message: WebI18nKey;
title: string;
subTitle: string;
columnTitle: string;
message: string;
details: BulkOperationStatus[];
}

3
bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.ts
View File

@ -4,7 +4,6 @@ import { combineLatest, map, Observable } from "rxjs";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { AccountProfile } from "@bitwarden/common/models/domain/account";
import { WebI18nKey } from "@bitwarden/web-vault/app/core/web-i18n.service.implementation";
@Component({
selector: "sm-header",
@ -14,7 +13,7 @@ export class HeaderComponent {
@Input() title: string;
@Input() searchTitle: string;
protected routeData$: Observable<{ title: WebI18nKey; searchTitle: WebI18nKey }>;
protected routeData$: Observable<{ title: string; searchTitle: string }>;
protected account$: Observable<AccountProfile>;
constructor(private route: ActivatedRoute, private stateService: StateService) {

4
bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.ts
View File

@ -1,8 +1,6 @@
import { SelectionModel } from "@angular/cdk/collections";
import { Component, EventEmitter, Input, Output } from "@angular/core";
import { WebI18nKey } from "@bitwarden/web-vault/app/core/web-i18n.service.implementation";
import { AccessTokenView } from "../models/view/access-token.view";
@Component({
@ -36,7 +34,7 @@ export class AccessListComponent {
: this.selection.select(...this.tokens.map((s) => s.id));
}
protected permission(token: AccessTokenView): WebI18nKey {
protected permission(token: AccessTokenView) {
return "canRead";
}
}

6
libs/angular/src/pipes/i18n.pipe.ts
View File

@ -5,10 +5,10 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@Pipe({
name: "i18n",
})
export class I18nPipe<TKey = string> implements PipeTransform {
constructor(private i18nService: I18nService<TKey>) {}
export class I18nPipe implements PipeTransform {
constructor(private i18nService: I18nService) {}
transform(id: TKey, p1?: string | number, p2?: string | number, p3?: string | number): string {
transform(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
return this.i18nService.t(id, p1, p2, p3);
}
}

3
libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts
View File

@ -1,8 +1,7 @@
import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders";
export type TopLevelTreeNodeName = "allVaults" | "types" | "collections" | "folders";
export class TopLevelTreeNode implements ITreeNodeObject {
id: TopLevelTreeNodeId;
name: TopLevelTreeNodeName; // localizationString
name: string; // localizationString
}

6
libs/common/src/abstractions/i18n.service.ts
View File

@ -1,11 +1,11 @@
import { Observable } from "rxjs";
export abstract class I18nService<TKey = string> {
export abstract class I18nService {
locale$: Observable<string>;
supportedTranslationLocales: string[];
translationLocale: string;
collator: Intl.Collator;
localeNames: Map<string, string>;
t: (id: TKey, p1?: string | number, p2?: string | number, p3?: string | number) => string;
translate: (id: TKey, p1?: string, p2?: string, p3?: string) => string;
t: (id: string, p1?: string | number, p2?: string | number, p3?: string | number) => string;
translate: (id: string, p1?: string, p2?: string, p3?: string) => string;
}

8
libs/common/src/models/response/plan.response.ts
View File

@ -8,12 +8,8 @@ export class PlanResponse extends BaseResponse {
product: ProductType;
name: string;
isAnnual: boolean;
nameLocalizationKey: "planNameFree" | "planNameFamilies" | "planNameTeams" | "planNameEnterprise";
descriptionLocalizationKey:
| "planDescFree"
| "planDescFamilies"
| "planDescTeams"
| "planDescEnterprise";
nameLocalizationKey: string;
descriptionLocalizationKey: string;
canBeUsedByBusiness: boolean;
baseSeats: number;
baseStorageGb: number;

2
libs/common/src/models/response/subscription.response.ts
View File

@ -60,7 +60,7 @@ export class BillingSubscriptionItemResponse extends BaseResponse {
name: string;
amount: number;
quantity: number;
interval: "month" | "year";
interval: string;
sponsoredSubscriptionItem: boolean;
constructor(response: any) {

8
libs/common/src/services/i18n.service.implementation.ts → libs/common/src/services/i18n.service.ts
View File

@ -1,8 +1,8 @@
import { Observable, ReplaySubject } from "rxjs";
import { I18nService } from "../abstractions/i18n.service";
import { I18nService as I18nServiceAbstraction } from "../abstractions/i18n.service";
export class I18nServiceImplementation<TKey = string> implements I18nService<TKey> {
export class I18nService implements I18nServiceAbstraction {
private _locale = new ReplaySubject<string>(1);
locale$: Observable<string> = this._locale.asObservable();
// First locale is the default (English)
@ -118,11 +118,11 @@ export class I18nServiceImplementation<TKey = string> implements I18nService<TKe
}
}
t(id: TKey, p1?: string, p2?: string, p3?: string): string {
t(id: string, p1?: string, p2?: string, p3?: string): string {
return this.translate(id, p1, p2, p3);
}
translate(id: TKey, p1?: string | number, p2?: string | number, p3?: string | number): string {
translate(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
let result: string;
// eslint-disable-next-line
if (this.localeMessages.hasOwnProperty(id) && this.localeMessages[id]) {