From eecf22a8ee4efe8de504e6303ecabafc94dcff20 Mon Sep 17 00:00:00 2001 From: John Harrington <84741727+harr1424@users.noreply.github.com> Date: Tue, 30 Sep 2025 09:03:44 -0700 Subject: [PATCH] Move the LogProvider and SemanticLogger to @bitwarden/logging --- .../credential-generator-history.component.ts | 2 +- apps/desktop/desktop_native/Cargo.lock | 4 +-- .../default-send-access-service.spec.ts | 2 +- .../default-send-access-service.ts | 2 +- .../send-access/try-send-access.guard.spec.ts | 2 +- .../src/tools/extension/extension.service.ts | 3 +- .../src/tools/log/default-semantic-logger.ts | 4 +-- libs/common/src/tools/log/disabled-logger.ts | 4 +-- libs/common/src/tools/log/factory.ts | 4 +-- libs/common/src/tools/log/index.ts | 2 -- libs/common/src/tools/log/types.ts | 11 ------- libs/common/src/tools/providers.ts | 4 +-- .../user-state-subject-dependency-provider.ts | 3 +- .../src/tools/state/user-state-subject.ts | 3 +- .../src/services/import.service.spec.ts | 32 ++++++++++++++----- libs/importer/src/services/import.service.ts | 2 +- libs/logging/src/index.ts | 13 ++++++++ .../src}/semantic-logger.abstraction.ts | 0 ...tial-generator-history-dialog.component.ts | 2 +- .../credential-generator-history.component.ts | 2 +- .../src/credential-generator.component.ts | 2 +- .../src/generator-services.module.ts | 7 ++-- .../src/passphrase-settings.component.ts | 2 +- .../src/password-generator.component.ts | 2 +- .../src/username-generator.component.ts | 2 +- .../available-algorithms-constraint.ts | 2 +- .../providers/generator-metadata-provider.ts | 2 +- .../providers/generator-profile-provider.ts | 2 +- ...fault-credential-generator.service.spec.ts | 3 +- .../default-credential-generator.service.ts | 2 +- 30 files changed, 72 insertions(+), 55 deletions(-) delete mode 100644 libs/common/src/tools/log/types.ts rename libs/{common/src/tools/log => logging/src}/semantic-logger.abstraction.ts (100%) diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts index 441e5d6e4c6..30e0bde8a5e 100644 --- a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts +++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts @@ -8,7 +8,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -19,6 +18,7 @@ import { EmptyCredentialHistoryComponent, } from "@bitwarden/generator-components"; import { GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { PopOutComponent } from "../../../platform/popup/components/pop-out.component"; import { PopupFooterComponent } from "../../../platform/popup/layout/popup-footer.component"; diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 55f474f2992..ca9965e5e18 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -2897,9 +2897,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640" +checksum = "cc198e42d9b7510827939c9a15f5062a0c913f3371d765977e586d2fe6c16f4a" dependencies = [ "bitflags", "core-foundation", diff --git a/apps/web/src/app/tools/send/send-access/default-send-access-service.spec.ts b/apps/web/src/app/tools/send/send-access/default-send-access-service.spec.ts index cd07d3684fb..02ad3ece05a 100644 --- a/apps/web/src/app/tools/send/send-access/default-send-access-service.spec.ts +++ b/apps/web/src/app/tools/send/send-access/default-send-access-service.spec.ts @@ -6,11 +6,11 @@ import { firstValueFrom, NEVER } from "rxjs"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { StateProvider } from "@bitwarden/common/platform/state"; import { mockAccountServiceWith, FakeStateProvider } from "@bitwarden/common/spec"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { UserId } from "@bitwarden/common/types/guid"; import { SYSTEM_SERVICE_PROVIDER } from "@bitwarden/generator-components"; +import { SemanticLogger } from "@bitwarden/logging"; import { DefaultSendAccessService } from "./default-send-access-service"; import { SEND_RESPONSE_KEY, SEND_CONTEXT_KEY } from "./send-access-memory"; diff --git a/apps/web/src/app/tools/send/send-access/default-send-access-service.ts b/apps/web/src/app/tools/send/send-access/default-send-access-service.ts index 732303ce25a..21377ae25b9 100644 --- a/apps/web/src/app/tools/send/send-access/default-send-access-service.ts +++ b/apps/web/src/app/tools/send/send-access/default-send-access-service.ts @@ -4,11 +4,11 @@ import { map, of, from, catchError, timeout } from "rxjs"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { StateProvider } from "@bitwarden/common/platform/state"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SYSTEM_SERVICE_PROVIDER } from "@bitwarden/generator-components"; +import { SemanticLogger } from "@bitwarden/logging"; import { SEND_RESPONSE_KEY, SEND_CONTEXT_KEY } from "./send-access-memory"; import { SendAccessService } from "./send-access-service.abstraction"; diff --git a/apps/web/src/app/tools/send/send-access/try-send-access.guard.spec.ts b/apps/web/src/app/tools/send/send-access/try-send-access.guard.spec.ts index 267de83db9f..8ff4abc7e70 100644 --- a/apps/web/src/app/tools/send/send-access/try-send-access.guard.spec.ts +++ b/apps/web/src/app/tools/send/send-access/try-send-access.guard.spec.ts @@ -2,9 +2,9 @@ import { TestBed } from "@angular/core/testing"; import { ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from "@angular/router"; import { firstValueFrom, Observable, of } from "rxjs"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { SYSTEM_SERVICE_PROVIDER } from "@bitwarden/generator-components"; +import { SemanticLogger } from "@bitwarden/logging"; import { SendAccessService } from "./send-access-service.abstraction"; import { trySendAccess } from "./try-send-access.guard"; diff --git a/libs/common/src/tools/extension/extension.service.ts b/libs/common/src/tools/extension/extension.service.ts index c4e6887b821..4532fe9943a 100644 --- a/libs/common/src/tools/extension/extension.service.ts +++ b/libs/common/src/tools/extension/extension.service.ts @@ -1,8 +1,9 @@ import { shareReplay } from "rxjs"; +import { SemanticLogger } from "@bitwarden/logging"; + import { Account } from "../../auth/abstractions/account.service"; import { BoundDependency } from "../dependencies"; -import { SemanticLogger } from "../log"; import { UserStateSubject } from "../state/user-state-subject"; import { UserStateSubjectDependencyProvider } from "../state/user-state-subject-dependency-provider"; diff --git a/libs/common/src/tools/log/default-semantic-logger.ts b/libs/common/src/tools/log/default-semantic-logger.ts index eb1ecbe36c6..aa46bd95a11 100644 --- a/libs/common/src/tools/log/default-semantic-logger.ts +++ b/libs/common/src/tools/log/default-semantic-logger.ts @@ -1,10 +1,10 @@ import { Jsonify } from "type-fest"; +import { SemanticLogger } from "@bitwarden/logging"; + import { LogService } from "../../platform/abstractions/log.service"; import { LogLevelType } from "../../platform/enums"; -import { SemanticLogger } from "./semantic-logger.abstraction"; - /** Sends semantic logs to the console. * @remarks the behavior of this logger is based on `LogService`; it * replaces dynamic messages (`%s`) with a JSON-formatted semantic log. diff --git a/libs/common/src/tools/log/disabled-logger.ts b/libs/common/src/tools/log/disabled-logger.ts index 53feb0c8b39..9923a793adc 100644 --- a/libs/common/src/tools/log/disabled-logger.ts +++ b/libs/common/src/tools/log/disabled-logger.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { deepFreeze } from "../util"; +import { SemanticLogger } from "@bitwarden/logging"; -import { SemanticLogger } from "./semantic-logger.abstraction"; +import { deepFreeze } from "../util"; /** All disabled loggers emitted by this module are `===` to this logger. */ export const DISABLED_LOGGER: SemanticLogger = deepFreeze({ diff --git a/libs/common/src/tools/log/factory.ts b/libs/common/src/tools/log/factory.ts index 5f0f2d74e91..4ec12c82fe9 100644 --- a/libs/common/src/tools/log/factory.ts +++ b/libs/common/src/tools/log/factory.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; +import { SemanticLogger, LogProvider } from "@bitwarden/logging"; + import { LogService } from "../../platform/abstractions/log.service"; import { DefaultSemanticLogger } from "./default-semantic-logger"; import { DISABLED_LOGGER } from "./disabled-logger"; -import { SemanticLogger } from "./semantic-logger.abstraction"; -import { LogProvider } from "./types"; import { warnLoggingEnabled } from "./util"; /** Instantiates a semantic logger that emits nothing when a message diff --git a/libs/common/src/tools/log/index.ts b/libs/common/src/tools/log/index.ts index 1c93a6ce63f..97927f1ec72 100644 --- a/libs/common/src/tools/log/index.ts +++ b/libs/common/src/tools/log/index.ts @@ -1,4 +1,2 @@ export * from "./factory"; export * from "./disabled-logger"; -export { LogProvider } from "./types"; -export { SemanticLogger } from "./semantic-logger.abstraction"; diff --git a/libs/common/src/tools/log/types.ts b/libs/common/src/tools/log/types.ts deleted file mode 100644 index ca887af4225..00000000000 --- a/libs/common/src/tools/log/types.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Jsonify } from "type-fest"; - -import { SemanticLogger } from "./semantic-logger.abstraction"; - -/** Creates a semantic logger. - * @param context all logs emitted by the logger are extended with - * these fields. - * @remarks The `message`, `level`, `provider`, and `content` fields - * are reserved for use by the semantic logging system. - */ -export type LogProvider = (context: Jsonify) => SemanticLogger; diff --git a/libs/common/src/tools/providers.ts b/libs/common/src/tools/providers.ts index ac42c556042..e327391da3c 100644 --- a/libs/common/src/tools/providers.ts +++ b/libs/common/src/tools/providers.ts @@ -1,4 +1,4 @@ -import { LogService } from "@bitwarden/logging"; +import { LogService, LogProvider } from "@bitwarden/logging"; import { BitwardenClient } from "@bitwarden/sdk-internal"; import { StateProvider } from "@bitwarden/state"; @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "../platform/abstractions/platform-utils.se import { LegacyEncryptorProvider } from "./cryptography/legacy-encryptor-provider"; import { ExtensionRegistry } from "./extension/extension-registry.abstraction"; import { ExtensionService } from "./extension/extension.service"; -import { disabledSemanticLoggerProvider, enableLogForTypes, LogProvider } from "./log"; +import { disabledSemanticLoggerProvider, enableLogForTypes } from "./log"; /** Provides access to commonly-used cross-cutting services. */ export type SystemServiceProvider = { diff --git a/libs/common/src/tools/state/user-state-subject-dependency-provider.ts b/libs/common/src/tools/state/user-state-subject-dependency-provider.ts index 89b6d7e7270..7a85ab2ba55 100644 --- a/libs/common/src/tools/state/user-state-subject-dependency-provider.ts +++ b/libs/common/src/tools/state/user-state-subject-dependency-provider.ts @@ -1,8 +1,9 @@ import { Jsonify } from "type-fest"; +import { SemanticLogger } from "@bitwarden/logging"; + import { StateProvider } from "../../platform/state"; import { LegacyEncryptorProvider } from "../cryptography/legacy-encryptor-provider"; -import { SemanticLogger } from "../log"; /** Aggregates user state subject dependencies */ export abstract class UserStateSubjectDependencyProvider { diff --git a/libs/common/src/tools/state/user-state-subject.ts b/libs/common/src/tools/state/user-state-subject.ts index e6b66d8f699..0bf813b4a62 100644 --- a/libs/common/src/tools/state/user-state-subject.ts +++ b/libs/common/src/tools/state/user-state-subject.ts @@ -29,11 +29,12 @@ import { switchMap, } from "rxjs"; +import { SemanticLogger } from "@bitwarden/logging"; + import { Account } from "../../auth/abstractions/account.service"; import { EncString } from "../../key-management/crypto/models/enc-string"; import { SingleUserState, UserKeyDefinition } from "../../platform/state"; import { UserEncryptor } from "../cryptography/user-encryptor.abstraction"; -import { SemanticLogger } from "../log"; import { anyComplete, pin, ready, withLatestReady } from "../rx"; import { Constraints, SubjectConstraints, WithConstraints } from "../types"; diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts index c3d555af936..829408f485b 100644 --- a/libs/importer/src/services/import.service.spec.ts +++ b/libs/importer/src/services/import.service.spec.ts @@ -63,10 +63,18 @@ describe("ImportService", () => { const environment = mock(); environment.getClientType.mockReturnValue(ClientType.Desktop); - systemServiceProvider = mock({ - configService, - environment, - log: jest.fn().mockReturnValue({ debug: jest.fn() }), + systemServiceProvider = mock(); + Object.defineProperty(systemServiceProvider, "configService", { + get: () => configService, + configurable: true, + }); + Object.defineProperty(systemServiceProvider, "environment", { + get: () => environment, + configurable: true, + }); + Object.defineProperty(systemServiceProvider, "log", { + get: () => jest.fn().mockReturnValue({ debug: jest.fn() }), + configurable: true, }); importService = new ImportService( @@ -285,10 +293,18 @@ describe("ImportService", () => { const environment = mock(); environment.getClientType.mockReturnValue(ClientType.Desktop); - systemServiceProvider = mock({ - configService, - environment, - log: jest.fn().mockReturnValue(mockLogger), + systemServiceProvider = mock(); + Object.defineProperty(systemServiceProvider, "configService", { + get: () => configService, + configurable: true, + }); + Object.defineProperty(systemServiceProvider, "environment", { + get: () => environment, + configurable: true, + }); + Object.defineProperty(systemServiceProvider, "log", { + get: () => jest.fn().mockReturnValue(mockLogger), + configurable: true, }); // Recreate the service with the updated mocks for logging tests diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts index da080bacaad..1b89edcf07f 100644 --- a/libs/importer/src/services/import.service.ts +++ b/libs/importer/src/services/import.service.ts @@ -20,7 +20,6 @@ import { KvpRequest } from "@bitwarden/common/models/request/kvp.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { OrganizationId } from "@bitwarden/common/types/guid"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -32,6 +31,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service"; import { KeyService } from "@bitwarden/key-management"; +import { SemanticLogger } from "@bitwarden/logging"; import { AscendoCsvImporter, diff --git a/libs/logging/src/index.ts b/libs/logging/src/index.ts index 8ce4b62cd3f..eccc178766b 100644 --- a/libs/logging/src/index.ts +++ b/libs/logging/src/index.ts @@ -1,3 +1,16 @@ +import { Jsonify } from "type-fest"; + +import { SemanticLogger } from "./semantic-logger.abstraction"; + export { LogService } from "./log.service"; export { LogLevel } from "./log-level"; export { ConsoleLogService } from "./console-log.service"; +export { SemanticLogger } from "./semantic-logger.abstraction"; + +/** Creates a semantic logger. + * @param context all logs emitted by the logger are extended with + * these fields. + * @remarks The `message`, `level`, `provider`, and `content` fields + * are reserved for use by the semantic logging system. + */ +export type LogProvider = (context: Jsonify) => SemanticLogger; diff --git a/libs/common/src/tools/log/semantic-logger.abstraction.ts b/libs/logging/src/semantic-logger.abstraction.ts similarity index 100% rename from libs/common/src/tools/log/semantic-logger.abstraction.ts rename to libs/logging/src/semantic-logger.abstraction.ts diff --git a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts index 9ec0e636f9a..a002a869a0f 100644 --- a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts +++ b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts @@ -16,13 +16,13 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; import { UserId } from "@bitwarden/common/types/guid"; import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components"; import { GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { CredentialGeneratorHistoryComponent as CredentialGeneratorHistoryToolsComponent } from "./credential-generator-history.component"; import { EmptyCredentialHistoryComponent } from "./empty-credential-history.component"; diff --git a/libs/tools/generator/components/src/credential-generator-history.component.ts b/libs/tools/generator/components/src/credential-generator-history.component.ts index 3965b2be83e..45d92e78cf9 100644 --- a/libs/tools/generator/components/src/credential-generator-history.component.ts +++ b/libs/tools/generator/components/src/credential-generator-history.component.ts @@ -9,7 +9,6 @@ import { Account } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -22,6 +21,7 @@ import { } from "@bitwarden/components"; import { AlgorithmsByType, CredentialGeneratorService } from "@bitwarden/generator-core"; import { GeneratedCredential, GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { GeneratorModule } from "./generator.module"; import { translate } from "./util"; diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts index 78b803392df..e9bf75d4263 100644 --- a/libs/tools/generator/components/src/credential-generator.component.ts +++ b/libs/tools/generator/components/src/credential-generator.component.ts @@ -32,7 +32,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { VendorId } from "@bitwarden/common/tools/extension"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -55,6 +54,7 @@ import { Type, } from "@bitwarden/generator-core"; import { GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { translate } from "./util"; diff --git a/libs/tools/generator/components/src/generator-services.module.ts b/libs/tools/generator/components/src/generator-services.module.ts index 935f7dc2d60..c2088b8b256 100644 --- a/libs/tools/generator/components/src/generator-services.module.ts +++ b/libs/tools/generator/components/src/generator-services.module.ts @@ -22,11 +22,7 @@ import { DefaultFields, DefaultSites, Extension } from "@bitwarden/common/tools/ import { RuntimeExtensionRegistry } from "@bitwarden/common/tools/extension/runtime-extension-registry"; import { VendorExtensions, Vendors } from "@bitwarden/common/tools/extension/vendor"; import { RestClient } from "@bitwarden/common/tools/integration/rpc"; -import { - LogProvider, - disabledSemanticLoggerProvider, - enableLogForTypes, -} from "@bitwarden/common/tools/log"; +import { disabledSemanticLoggerProvider, enableLogForTypes } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { UserStateSubjectDependencyProvider } from "@bitwarden/common/tools/state/user-state-subject-dependency-provider"; import { @@ -38,6 +34,7 @@ import { DefaultCredentialGeneratorService, } from "@bitwarden/generator-core"; import { KeyService } from "@bitwarden/key-management"; +import { LogProvider } from "@bitwarden/logging"; export const RANDOMIZER = new SafeInjectionToken("Randomizer"); const GENERATOR_SERVICE_PROVIDER = new SafeInjectionToken( diff --git a/libs/tools/generator/components/src/passphrase-settings.component.ts b/libs/tools/generator/components/src/passphrase-settings.component.ts index b3525251392..98a34cfc66c 100644 --- a/libs/tools/generator/components/src/passphrase-settings.component.ts +++ b/libs/tools/generator/components/src/passphrase-settings.component.ts @@ -16,7 +16,6 @@ import { Account } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -25,6 +24,7 @@ import { PassphraseGenerationOptions, BuiltIn, } from "@bitwarden/generator-core"; +import { SemanticLogger } from "@bitwarden/logging"; const Controls = Object.freeze({ numWords: "numWords", diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts index b293aeb7e2d..fd2283e0fd1 100644 --- a/libs/tools/generator/components/src/password-generator.component.ts +++ b/libs/tools/generator/components/src/password-generator.component.ts @@ -28,7 +28,6 @@ import { Account, AccountService } from "@bitwarden/common/auth/abstractions/acc import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -49,6 +48,7 @@ import { Profile, } from "@bitwarden/generator-core"; import { GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { toAlgorithmInfo, translate } from "./util"; diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts index 6227bcd3f7c..e8bc7906872 100644 --- a/libs/tools/generator/components/src/username-generator.component.ts +++ b/libs/tools/generator/components/src/username-generator.component.ts @@ -33,7 +33,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { VendorId } from "@bitwarden/common/tools/extension"; import { - SemanticLogger, disabledSemanticLoggerProvider, ifEnabledSemanticLoggerProvider, } from "@bitwarden/common/tools/log"; @@ -55,6 +54,7 @@ import { Algorithm, } from "@bitwarden/generator-core"; import { GeneratorHistoryService } from "@bitwarden/generator-history"; +import { SemanticLogger } from "@bitwarden/logging"; import { toAlgorithmInfo, translate } from "./util"; diff --git a/libs/tools/generator/core/src/policies/available-algorithms-constraint.ts b/libs/tools/generator/core/src/policies/available-algorithms-constraint.ts index 1824581664b..a05749e70f3 100644 --- a/libs/tools/generator/core/src/policies/available-algorithms-constraint.ts +++ b/libs/tools/generator/core/src/policies/available-algorithms-constraint.ts @@ -1,6 +1,6 @@ -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { UserStateSubjectDependencyProvider } from "@bitwarden/common/tools/state/user-state-subject-dependency-provider"; import { Constraints, StateConstraints } from "@bitwarden/common/tools/types"; +import { SemanticLogger } from "@bitwarden/logging"; import { CredentialAlgorithm, CredentialType } from "../metadata"; import { CredentialPreference } from "../types"; diff --git a/libs/tools/generator/core/src/providers/generator-metadata-provider.ts b/libs/tools/generator/core/src/providers/generator-metadata-provider.ts index 52901545023..5e3ba8792f7 100644 --- a/libs/tools/generator/core/src/providers/generator-metadata-provider.ts +++ b/libs/tools/generator/core/src/providers/generator-metadata-provider.ts @@ -4,11 +4,11 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Account } from "@bitwarden/common/auth/abstractions/account.service"; import { BoundDependency } from "@bitwarden/common/tools/dependencies"; import { ExtensionSite } from "@bitwarden/common/tools/extension"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { anyComplete, memoizedMap, pin } from "@bitwarden/common/tools/rx"; import { UserStateSubject } from "@bitwarden/common/tools/state/user-state-subject"; import { UserStateSubjectDependencyProvider } from "@bitwarden/common/tools/state/user-state-subject-dependency-provider"; +import { SemanticLogger } from "@bitwarden/logging"; import { GeneratorMetadata, diff --git a/libs/tools/generator/core/src/providers/generator-profile-provider.ts b/libs/tools/generator/core/src/providers/generator-profile-provider.ts index 4117d1f2a78..c1a3bc57189 100644 --- a/libs/tools/generator/core/src/providers/generator-profile-provider.ts +++ b/libs/tools/generator/core/src/providers/generator-profile-provider.ts @@ -12,10 +12,10 @@ import { import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { Account } from "@bitwarden/common/auth/abstractions/account.service"; import { BoundDependency } from "@bitwarden/common/tools/dependencies"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { anyComplete } from "@bitwarden/common/tools/rx"; import { UserStateSubject } from "@bitwarden/common/tools/state/user-state-subject"; import { UserStateSubjectDependencyProvider } from "@bitwarden/common/tools/state/user-state-subject-dependency-provider"; +import { SemanticLogger } from "@bitwarden/logging"; import { ProfileContext, CoreProfileMetadata, ProfileMetadata } from "../metadata"; import { GeneratorConstraints } from "../types/generator-constraints"; diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts index 81e7ae6ac63..f1c27cdb77b 100644 --- a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts +++ b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts @@ -5,8 +5,9 @@ import { ConsoleLogService } from "@bitwarden/common/platform/services/console-l import { Site, VendorId } from "@bitwarden/common/tools/extension"; import { Bitwarden } from "@bitwarden/common/tools/extension/vendor/bitwarden"; import { Vendor } from "@bitwarden/common/tools/extension/vendor/data"; -import { SemanticLogger, ifEnabledSemanticLoggerProvider } from "@bitwarden/common/tools/log"; +import { ifEnabledSemanticLoggerProvider } from "@bitwarden/common/tools/log"; import { UserId } from "@bitwarden/common/types/guid"; +import { SemanticLogger } from "@bitwarden/logging"; import { awaitAsync } from "../../../../../common/spec"; import { diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.ts index 453139d284c..ddc4fd7a72d 100644 --- a/libs/tools/generator/core/src/services/default-credential-generator.service.ts +++ b/libs/tools/generator/core/src/services/default-credential-generator.service.ts @@ -18,10 +18,10 @@ import { import { Account } from "@bitwarden/common/auth/abstractions/account.service"; import { BoundDependency, OnDependency } from "@bitwarden/common/tools/dependencies"; import { VendorId } from "@bitwarden/common/tools/extension"; -import { SemanticLogger } from "@bitwarden/common/tools/log"; import { SystemServiceProvider } from "@bitwarden/common/tools/providers"; import { anyComplete, memoizedMap } from "@bitwarden/common/tools/rx"; import { UserStateSubject } from "@bitwarden/common/tools/state/user-state-subject"; +import { SemanticLogger } from "@bitwarden/logging"; import { CredentialGeneratorService } from "../abstractions"; import {